Merge branch 'MDL-62925_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jul 2018 16:31:48 +0000 (18:31 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jul 2018 16:31:48 +0000 (18:31 +0200)
commit402d1c538af687cdf32e58fafe0528173732b738
treea10527c942f83cc8d3777425688ea0c81a98d733
parentf7497ace8a1a6e160c17e63cb1c2217fa46ed7b9
parent94a1861c84b4cb582ed681f290fed4f1f7a19f12
Merge branch 'MDL-62925_master' of git://github.com/markn86/moodle