Merge branch 'MDL-66367_master' of git://github.com/markn86/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 5 Sep 2019 01:26:28 +0000 (09:26 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 5 Sep 2019 01:26:28 +0000 (09:26 +0800)
commit27963562784b33c270d92e5fe55bdfd25b348f8f
tree2b2c2272a8ca9ff53fff9000379acf8b971bbc0a
parent9533156775bcc16c5695f3279b4cdd2edf2c3c64
parentaf8a70756feab9f88d894f618d824be2b83b260f
Merge branch 'MDL-66367_master' of git://github.com/markn86/moodle
lang/en/admin.php
lib/amd/build/templates.min.js
lib/amd/build/templates.min.js.map
lib/amd/src/templates.js
lib/upgrade.txt
version.php