Merge branch 'MDL-35977-master' of git://github.com/mihailges/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 23 Jul 2018 07:30:51 +0000 (15:30 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 23 Jul 2018 07:30:51 +0000 (15:30 +0800)
commit9266d248278c8513d8eb65f55ebc804306536a21
treec05d20837d701ebc5c10aa78a608946e6105704a
parent60bf79ac882a07d6949cd7a6306dfef0df6c6a8b
parent329a84b4899b53afb9244a38cdbc8e4618cc4a36
Merge branch 'MDL-35977-master' of git://github.com/mihailges/moodle