Merge branch 'MDL-56699-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 9 Nov 2016 01:11:55 +0000 (02:11 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 9 Nov 2016 01:11:55 +0000 (02:11 +0100)
commit6c5ee657a78de53d3d35e90db9213a519866b005
tree7f08b2296f3fe766bdbc53ac097a406059c3eca8
parent0cbfb7ff2a5b29cfef8114b6ce031a547d452ee2
parent88e709ae43199a357c33019de62e2c4d8fbd43a9
Merge branch 'MDL-56699-master' of git://github.com/damyon/moodle
lib/navigationlib.php