Merge branch 'wip-MDL-61937-master-fix' of https://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 May 2018 06:43:04 +0000 (14:43 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 May 2018 06:43:04 +0000 (14:43 +0800)
commit9f7aeac5e576960becba21daa01a2f98b0e6672f
tree76c4068f60387a2544a9336914588c4a9eebcd6b
parent4f2bc5bc8fa8602a7ccf42346d2d1bb7dbb665a4
parentae3b1c0048dab5e83b3208218cfea6d6afb725fc
Merge branch 'wip-MDL-61937-master-fix' of https://github.com/marinaglancy/moodle