Merge branch 'wip-MDL-60314-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 19 Oct 2017 21:17:26 +0000 (23:17 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 19 Oct 2017 21:17:26 +0000 (23:17 +0200)
commitc1321a9a0227d91bf2ecc814c170f4e9f6bbc4dc
treee9c0695bb25308675d561e6f28e1c53b92b841c0
parent9b46afd7c3d80715349c71cb446b764ef1d4a4e0
parent0b844a832277dd655b6aa91453b75d5988142270
Merge branch 'wip-MDL-60314-master' of git://github.com/marinaglancy/moodle
lib/navigationlib.php