Merge branch 'MDL-59913-master' of https://github.com/sammarshallou/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 Oct 2017 04:44:25 +0000 (12:44 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 Oct 2017 04:44:25 +0000 (12:44 +0800)
commit8905d3efe057e5103ec81ddae65cd3a46949781b
tree80ad77cbad15fbbed6dfabaa3dd751d05c69d7d2
parentdf3571cfb6935b24d6a68f54da541f36a8a70bf7
parent2d94d4ea7c465960fbaa9a426fb91cd536c68b6d
Merge branch 'MDL-59913-master' of https://github.com/sammarshallou/moodle