Merge branch 'MDL-17943_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Jun 2018 18:23:57 +0000 (20:23 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Jun 2018 18:23:57 +0000 (20:23 +0200)
commit3d371e6971c5ca6dc7a86561b11004b6a9a63d85
treec8dae94d971e1bea32394a8833b7f354635566a2
parenta7fb68f27f82b986d8a1457fb23c21f8016b6c66
parentcf24ef0279c261529f6e728b140337861fcd926f
Merge branch 'MDL-17943_master' of git://github.com/markn86/moodle