Merge branch 'MDL-63130_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Sep 2018 21:55:00 +0000 (23:55 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Sep 2018 21:55:00 +0000 (23:55 +0200)
commitdb5057d7bdc97c138c5dc6363ae456290a6fdc31
tree2b35c97f03a2cd8a1d253a901c675a5f0087021e
parent6625cff604a9162981f096ad44257d94fddc06af
parent8a261177f7aadd1016cf0be5877fe6c4c412d033
Merge branch 'MDL-63130_master' of git://github.com/markn86/moodle