Merge branch 'MDL-35290-master' of https://github.com/snake/moodle
commitd3e6c398f4e4bf2a620d15cfadaeb3f0f803a843
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 29 Aug 2017 05:14:22 +0000 (29 13:14 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 29 Aug 2017 05:14:22 +0000 (29 13:14 +0800)
tree995d1c4e1b048fbe6fcd27cd3320473568c23e24
parent4bdf6157d4d4359b50c44955cd2e556038b5b353
parent7a170fad854e3ffd2c09548470d2e061b83d13f3
Merge branch 'MDL-35290-master' of https://github.com/snake/moodle