Merge branch 'MDL-61838-master' of git://github.com/mihailges/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 10 Apr 2018 11:44:05 +0000 (13:44 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 10 Apr 2018 11:44:05 +0000 (13:44 +0200)
commit5ba5a5e31d1338f264257eb31645712e15d10029
treee53acf74ebb7f9d9b0bbf51f2f2cde700e055187
parent8373df968751a42be3d61360ec3b906da3e88fbb
parentc2384dde1368684b215f2a3206cb3ea583996626
Merge branch 'MDL-61838-master' of git://github.com/mihailges/moodle