Merge branch 'MDL-61309-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 10 May 2018 00:03:17 +0000 (02:03 +0200)
committerJun Pataleta <jun@moodle.com>
Thu, 10 May 2018 01:17:31 +0000 (09:17 +0800)
commitc3da16f13d41c2c5e2b6c19db8fb8a3e8f350fb9
tree2faa6948075c5216328c06c5d1c3322cb65c7292
parent51b3c29b92928bc6bcf528641e6465320ce27891
parentdb4754e98cf0f87193176640853066b8c79f6e3f
Merge branch 'MDL-61309-master' of git://github.com/andrewnicols/moodle