Merge branch 'wip-MDL-52008-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 9 Nov 2015 05:16:06 +0000 (13:16 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 9 Nov 2015 05:16:06 +0000 (13:16 +0800)
commit814809d59ee83a25117e777f647fcea609b53e86
treeed8eb2579255be277122e5daecd966bdbd7516f0
parent82467e580b51c41621e68b587700bb913d42cfa4
parent9e8d0842ba1942824e7019a592c4007a3a238795
Merge branch 'wip-MDL-52008-master' of git://github.com/abgreeve/moodle
lib/javascript-static.js
lib/outputrenderers.php