Merge branch 'MDL-60156-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Sep 2017 18:36:25 +0000 (20:36 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Sep 2017 18:36:25 +0000 (20:36 +0200)
commit25759080d66a57aa6d244e2dfae83af35c978f98
tree7ccb11ee5fbd17a89ff2323606aa22b88b5fb4e9
parent536572cf0b6b674d64345ca687d80937319d4855
parent3fb45f57e4ecd053495c6985a08768e309de30c5
Merge branch 'MDL-60156-master' of git://github.com/andrewnicols/moodle