Merge branch 'MDL-62515-master' of git://github.com/junpataleta/moodle
commit87095d14054fca52abe76805279aa2d0af5e1e0b
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 28 May 2018 04:27:45 +0000 (28 12:27 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 28 May 2018 04:27:45 +0000 (28 12:27 +0800)
tree3af044b503f84414f34498e4b6eebaec82613e64
parent6a7a11a7b320c7999aba30131beb5f4c42b55773
parent3f3f914d4608d82a70a4f8bfb4e0295eaff4d892
Merge branch 'MDL-62515-master' of git://github.com/junpataleta/moodle