Merge branch 'wip-MDL-63165-master' of https://github.com/Beedell/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 28 Aug 2018 10:28:25 +0000 (12:28 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 28 Aug 2018 10:28:25 +0000 (12:28 +0200)
commit4f855defce4ba47786447e06490c5fa7fa37086c
tree88be24d8586832085a3cfe146748ae7cd166a880
parentefbbbf33735a192bbd79b1615eb39676686ce3a0
parentd0a60444a1b546e7d03be9d413e450a7d9992089
Merge branch 'wip-MDL-63165-master' of https://github.com/Beedell/moodle