Merge branch 'MDL-59879-master' of https://github.com/abias/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 12 Sep 2017 05:04:34 +0000 (07:04 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 12 Sep 2017 05:04:34 +0000 (07:04 +0200)
1  2 
lib/navigationlib.php

Simple merge