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)
1  2 
lib/navigationlib.php

Simple merge