Merge branch 'MDL-61943-master' of git://github.com/cescobedo/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 8 May 2018 14:43:50 +0000 (16:43 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 8 May 2018 14:43:50 +0000 (16:43 +0200)
commit5d2dd881e351f0bc4b0a983630c5bff7b9f3410b
tree4ac86202c4d29d03fb64d0af400c1108d2af9332
parent02c7769422633f9b30ece28777e5b6f5a596eb49
parenta69de9ba0555067a1f819502ce4caf5f700b47e4
Merge branch 'MDL-61943-master' of git://github.com/cescobedo/moodle