Merge branch 'MDL-59826-master' of https://github.com/snake/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 22 Aug 2017 07:49:11 +0000 (15:49 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 22 Aug 2017 07:49:11 +0000 (15:49 +0800)
commit4508e143d81bfce88a0dca1f8ec50e5490beeebc
tree6a767a5785bd40aefb15b162a2019f83f35402b0
parent170bbc84a77067272b1763a5961698e5e99ea89e
parent788ea5c85c3e4cb836dc8a2373bc9150494c27f0
Merge branch 'MDL-59826-master' of https://github.com/snake/moodle