Merge branch 'MDL-59599-master' of https://github.com/Kathrin84/moodle
commit727592291bf1b134dc9097a732a80a288239b3c9
authorDavid Monllao <davidm@moodle.com>
Mon, 9 Jul 2018 09:58:53 +0000 (9 11:58 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 9 Jul 2018 09:58:53 +0000 (9 11:58 +0200)
tree4e9de9b2e4951c9a47ee60a09bde346c83607417
parent31431602045ee66f038d6660234c2e138904a336
parentf37c3ec832b53c0d7b6e00ec49adaa35b02c7c95
Merge branch 'MDL-59599-master' of https://github.com/Kathrin84/moodle