Merge branch 'MDL-56341-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 24 Oct 2016 02:11:20 +0000 (10:11 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 24 Oct 2016 02:11:20 +0000 (10:11 +0800)
commitab00bf59a5a5c4316ad57b73f583cc0669cb24ba
treeee2ba75a7618cee7ecf5657cdf3ae477bd326ec5
parent40e342718bb8f4afd3ef580b77c893fd96a7f8b3
parenta89cf23744700bc006986e52246eed4c741e8fb5
Merge branch 'MDL-56341-master' of git://github.com/damyon/moodle
lib/amd/build/templates.min.js
lib/amd/src/templates.js