Merge branch 'MDL-56597-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 31 Oct 2016 15:10:02 +0000 (15:10 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 31 Oct 2016 15:10:02 +0000 (15:10 +0000)
commit5ad34c43f6c813a4d5199233c4c99830a1bbfaa8
tree3d97173a56584710cceff8ea9ef09aebe4dc9fc1
parent0e86392133241870af60254eb1510f611612e0d6
parentbff9fd896a4f35aabe7ac31b0166d629409038d8
Merge branch 'MDL-56597-master' of git://github.com/damyon/moodle
lib/outputrenderers.php
lib/yui/build/moodle-core-maintenancemodetimer/moodle-core-maintenancemodetimer-debug.js
lib/yui/build/moodle-core-maintenancemodetimer/moodle-core-maintenancemodetimer-min.js
lib/yui/build/moodle-core-maintenancemodetimer/moodle-core-maintenancemodetimer.js
lib/yui/src/maintenancemodetimer/js/maintenancemodetimer.js