Merge branch 'wip-MDL-56586-master-2' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 24 Nov 2016 09:30:29 +0000 (09:30 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 24 Nov 2016 09:30:29 +0000 (09:30 +0000)
1  2 
blocks/activity_results/tests/behat/addblockinactivity.feature
lib/navigationlib.php