Merge branch 'MDL-60175-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 19 Oct 2017 07:07:05 +0000 (09:07 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 19 Oct 2017 07:07:05 +0000 (09:07 +0200)
commitc1c7cb9c423ec0925f9760d43a69cd29a6f47651
tree7b249594feca5e13e956c15c09720ac462f2f2bd
parenta0d3a28abb627f98a4c9608d28f49785525a812f
parentbad477584f149ee95686e93a6509db41f5ae8078
Merge branch 'MDL-60175-master' of git://github.com/andrewnicols/moodle