Merge branch 'MDL-47114-master' of git://github.com/rezaies/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 5 Dec 2017 01:51:37 +0000 (09:51 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 6 Dec 2017 06:53:30 +0000 (19:53 +1300)
commit9e51dc406f2eb221765f7be2fd98b267ea49dd75
tree682b5738f05e1197791f00eb646fe2c0d494dc84
parentebe2fafa8b3974412d145ec250a69e08bb90c6bb
parent8c42eef35c83720956a0f15322dcc6981decb5a4
Merge branch 'MDL-47114-master' of git://github.com/rezaies/moodle