Merge branch 'MDL-61377-master' of git://github.com/rezaies/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 7 Feb 2018 04:52:26 +0000 (12:52 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 7 Feb 2018 04:52:26 +0000 (12:52 +0800)
commita87c7c03ad3e9d41f6e62cb09281332b303b82c7
treec770494e28b01242eda7fcba35d3cfc7165b7790
parentfd26d7318e920f51f13d61abbb24e86c7bfc348e
parent38b1d6cdd9143c730684424799e3cdc22c598141
Merge branch 'MDL-61377-master' of git://github.com/rezaies/moodle