Merge branch 'MDL-62152-master' of git://github.com/bmbrands/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Apr 2018 20:44:39 +0000 (22:44 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Apr 2018 20:44:39 +0000 (22:44 +0200)
commita76032ce8dd504139d39d897b6dc4a37947702ef
tree6015ba72257172e7f809d8acc7ca1ab07c18e6fb
parent06f49a5eb25dfcac1a01303e23e74fb0e8a4f834
parent323ce3952b3a9219d09f789069aa35feb2a998d5
Merge branch 'MDL-62152-master' of git://github.com/bmbrands/moodle