Merge branch 'MDL-61397-master' of git://github.com/zig-moodle/moodle
commit0d944ce5b0a11d372d23b36a3e3a5d6ae356f448
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 13 Mar 2018 04:23:57 +0000 (13 12:23 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 13 Mar 2018 04:23:57 +0000 (13 12:23 +0800)
tree4f80abfe86ef7b870e790fa2a56c235f0488823f
parent1290576dabaddfee532868e2c44e2e490d40f5dd
parent38a0477575fac686df9baae87477dce97e83ee87
Merge branch 'MDL-61397-master' of git://github.com/zig-moodle/moodle