Merge branch 'MDL-57281-master-fix' of https://github.com/andrewnicols/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 23 Aug 2018 07:47:28 +0000 (15:47 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 23 Aug 2018 07:47:28 +0000 (15:47 +0800)
commit2c6771d7933dd0e442acab1cb5430e7b35418c22
tree3c21affd776fab15bba99b3915957e8e54060818
parenta37a616213cc568a44da0d53440eccac87bd882e
parent67984597fb80d8e9638f2d180d8607ff9a7b478f
Merge branch 'MDL-57281-master-fix' of https://github.com/andrewnicols/moodle