Merge branch 'MDL-60653-master' of git://github.com/rezaies/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 18 Dec 2017 16:59:32 +0000 (17:59 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 18 Dec 2017 16:59:32 +0000 (17:59 +0100)
commit73aa231f83a0af8970998967841cac435da57189
treeadf27eb483ac0b3f364b8cef172f736cc2a2b81e
parent4ea34b6d65179d7e64c02082bb49442cb1f2cb97
parente53a38c666635ed321faa36c76b8a72c7fc09a46
Merge branch 'MDL-60653-master' of git://github.com/rezaies/moodle
lib/navigationlib.php