Merge branch 'MDL-52237-master' of git://github.com/StudiUM/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 1 Dec 2015 09:16:31 +0000 (17:16 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 3 Dec 2015 10:11:02 +0000 (11:11 +0100)
commit00419a7a0b53984128ba1ecc4141dcb06266b9b6
treec7c67f12b8c95d43d2dc81f73b2b115fa2405b0d
parente070165f57d9d66ea7dbb8248228860728540d36
parent20dde5e67405136de4d93bcacd1321eaa0a60319
Merge branch 'MDL-52237-master' of git://github.com/StudiUM/moodle
lib/navigationlib.php
lib/upgrade.txt