Merge branch 'MDL-60720-master' of https://github.com/sammarshallou/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 8 Nov 2017 16:27:15 +0000 (17:27 +0100)
committerDavid Monllao <davidm@moodle.com>
Wed, 8 Nov 2017 16:27:15 +0000 (17:27 +0100)
commit7effd6dd79159ab461e5857f36223bb296c5b248
tree8bd8bb2f7c7319befcabcff74453d0b304bd854d
parent29adfbc3c80a774772bf4d91eee988c0d4c9e675
parent4b0facc98448226cc7aec9e9762571a3d919d73b
Merge branch 'MDL-60720-master' of https://github.com/sammarshallou/moodle