Merge branch 'MDL-59247-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Oct 2017 21:48:24 +0000 (23:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Oct 2017 21:48:24 +0000 (23:48 +0200)
commitd617d7022ed5910e16ad96bb6581bd1c396abd6a
tree0e7440f4b094f82d7538db64ad750bf2e2e8d036
parentaee4aca9424c2bdf632dd8d58dd517e556b1ec9e
parentb1e896cf2aaa762ffa5e5c891852734e7bb4d31f
Merge branch 'MDL-59247-master' of git://github.com/jleyva/moodle