Merge branch 'MDL-62433-master' of git://github.com/sarjona/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 May 2018 21:30:46 +0000 (23:30 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 May 2018 21:30:46 +0000 (23:30 +0200)
commit3811659bc7f6faef86cbec0b23cdf9764dd785bf
tree1a83e8e0c2164fe77461c4479e8dbc946b7fc6c6
parentcd0f1aa403d81b5e72272aaf486842528aff4f05
parent68ed91b7af39228bc0f41d298022779c897af70f
Merge branch 'MDL-62433-master' of git://github.com/sarjona/moodle