Merge branch 'MDL-60861-master' of git://github.com/ankitagarwal/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 04:38:11 +0000 (12:38 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 04:38:11 +0000 (12:38 +0800)
commita576da555eaf10d2619ab3116666749f06db77bf
treebd49d04f38bc6e4ca407fcd3e0a5bc2339db1313
parent233c91e7d01462014147d86f49f90c9b30b91d59
parent8d6b7f0c6cb18598899aa794b7d79c5f5a2e430c
Merge branch 'MDL-60861-master' of git://github.com/ankitagarwal/moodle