Merge branch 'MDL-61994-master' of git://github.com/lameze/moodle
commitaea028ff2993121940bcb1b1bc8df3b12e7c028b
authorDavid Monllao <davidm@moodle.com>
Wed, 9 May 2018 09:11:36 +0000 (9 11:11 +0200)
committerJun Pataleta <jun@moodle.com>
Thu, 10 May 2018 01:15:58 +0000 (10 09:15 +0800)
tree5932b17195c3296147b7129bc22eae3a9fa21503
parentf60b216de0f43195f81694797fe932ed45a1c7fd
parentfe80a5ab669948b1e61f83a9b7326b003a5d2eb5
Merge branch 'MDL-61994-master' of git://github.com/lameze/moodle