Merge branch 'MDL-58317-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 21 Mar 2017 08:03:42 +0000 (08:03 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 21 Mar 2017 08:03:42 +0000 (08:03 +0000)
commitdca0ea03b1a4f3a465c2ba0e947ca1bff1429d86
treef85c3b31cf95d3d2db7d70aeae2fe42dd4e3d516
parent67b09d8323f1b1e8960d09fe955645b29441f7e7
parentf4e623b3e7e68eee2eb01535c68aefebd234c8bf
Merge branch 'MDL-58317-master' of git://github.com/damyon/moodle
lib/amd/build/templates.min.js
lib/amd/src/templates.js