Merge branch 'MDL-59246-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Oct 2017 21:08:25 +0000 (23:08 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Oct 2017 21:08:25 +0000 (23:08 +0200)
commitaee4aca9424c2bdf632dd8d58dd517e556b1ec9e
tree0fdfa57625a54111883e703b641229873278b47a
parent3255109721d7183a254207d42564c66c2f3278d6
parent30b54b823a5c499d4f4bdc7aea4fe056c586d8a2
Merge branch 'MDL-59246-master' of git://github.com/jleyva/moodle