Merge branch 'MDL-59506-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Aug 2017 17:55:19 +0000 (19:55 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Aug 2017 17:55:19 +0000 (19:55 +0200)
commita0d85e1828b9002f8939ba6bbbbd095a97558dab
treee8bc819b525b7174073c01f123926a5b5125fcad
parentd4c8235f87d9c0be10813457cfa896915ac7eebc
parent5bc4c797a75e4f2cd09b671cad648736ee5d8671
Merge branch 'MDL-59506-master' of git://github.com/andrewnicols/moodle