Merge branch 'MDL-62056-master' of git://github.com/sarjona/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 9 May 2018 13:20:46 +0000 (15:20 +0200)
committerJun Pataleta <jun@moodle.com>
Thu, 10 May 2018 01:17:28 +0000 (09:17 +0800)
commit337673949b963692767643da80e405df49294c20
treeba55238c7bea6aad5fd307c4de2582a833d1f446
parent06ede94f07d8737fde90e0960393abaf7a60ce0e
parentfd7174d03f60dcdd8858f3063d2f9399961723ae
Merge branch 'MDL-62056-master' of git://github.com/sarjona/moodle