Merge branch 'MDL-59810-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 15 Aug 2017 05:05:33 +0000 (13:05 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 15 Aug 2017 05:05:33 +0000 (13:05 +0800)
commitb66c2f561b1de5dd46b052ff3f761108432286d2
tree7043dd7f3427bd73383b48cd0235ecc1e264fa42
parentfa435675ec15cd54c870d9f4e2caf98d1d06b90e
parent5d942f5a53df3fdc68016ffdf3b2e223afa6fccc
Merge branch 'MDL-59810-master' of git://github.com/lameze/moodle