Merge branch 'MDL-61150' of git://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 13 Feb 2018 01:01:31 +0000 (09:01 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 13 Feb 2018 01:01:31 +0000 (09:01 +0800)
commit486f7c9555cb2ea6ef8e9e3c976fc52648369aca
treee43c491693b62c047d58ac3ce614d70f27dca06a
parentadc3c068bb9564eddcbf813447c3af1dc7451a9b
parent54a099e989027f0f143dbd1efa7b48ad2d7cfd4a
Merge branch 'MDL-61150' of git://github.com/stronk7/moodle