Merge branch 'MDL-59241-master' of git://github.com/jleyva/moodle
commit86345473ec64e659b03f1912114f7c2a8304e36c
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 2 Oct 2017 07:52:40 +0000 (2 15:52 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 2 Oct 2017 07:52:40 +0000 (2 15:52 +0800)
tree18183122f154f2e3863d04c444951d8c0220f160
parent39195b6aed7d5b99360e9b4356b619f735f4ac37
parent3f08cfc530c97384511e66001145c608544afae2
Merge branch 'MDL-59241-master' of git://github.com/jleyva/moodle