Merge branch 'MDL-62449-master' of git://github.com/sarjona/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jun 2018 16:18:51 +0000 (18:18 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jun 2018 16:18:51 +0000 (18:18 +0200)
commit3a55517a53fba050740ddcba3bc27e9fb61541c9
tree1d734e34f38631981e987b6eb64fe920eefc5646
parentfa6f911fc5be0327fc91bcd7b4df56e24328fa8c
parent1d76dd714c56eb5ca7a303d13b2a9a087ee190bb
Merge branch 'MDL-62449-master' of git://github.com/sarjona/moodle