Merge branch 'MDL-61402' of https://github.com/mkassaei/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 20 Feb 2018 02:36:41 +0000 (10:36 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 22 Feb 2018 00:30:53 +0000 (08:30 +0800)
commit3a7ae79555a435c0582379d10b8bf3c2f137c375
tree690438a5ca30aafc6b08a4fe85769aa1c8194f1e
parent2b32b1fea83adcd7c74df8b7f2f9e9dc1afd3f21
parent7ce538be0f76cf411d99c7131346402e9c8f96bd
Merge branch 'MDL-61402' of https://github.com/mkassaei/moodle