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