Merge branch 'MDL-36985-master' of https://github.com/snake/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 22 Aug 2017 06:37:55 +0000 (14:37 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 22 Aug 2017 06:37:55 +0000 (14:37 +0800)
commit474c7ee757094ba0843bcc74a25c96f2d86d78c3
tree8e082852b7a6c9ac2bfe063c61f1912223d15067
parent8df7bfff0dbb59390a6a06bfada9d33ec40aa8a8
parent81ed702156743ccd8f666e0639c9d238fd4c4554
Merge branch 'MDL-36985-master' of https://github.com/snake/moodle