Merge branch 'MDL-62248-master-fix' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 30 Apr 2018 13:23:14 +0000 (21:23 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 30 Apr 2018 13:23:14 +0000 (21:23 +0800)
commit732ebbe0fea8b61f2bf41b7be945ff1ac8cf1363
treebcc2ac4c747c80447dc8f91688c61cdd171c7b35
parent7816cac9fe2fb4c90405c226b30252be542a97df
parent9b7527defc78ebce22c3727757158fb58f309d04
Merge branch 'MDL-62248-master-fix' of git://github.com/andrewnicols/moodle