Merge branch 'MDL-55611-master' of git://github.com/danpoltawski/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 4 Apr 2017 16:07:41 +0000 (17:07 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 4 Apr 2017 16:07:41 +0000 (17:07 +0100)
commit1e4e5c52d79c95f07ea65828fd272f8e3cb5e0be
treeb9d0a91ff26e9a045915883e4c211ac990f2d1b5
parent125c4c4cb87f83cf91d187d5278b7e1777ce4b19
parent14286ebd4a136a30bbb1d1f7e29e825e1db6e09b
Merge branch 'MDL-55611-master' of git://github.com/danpoltawski/moodle
28 files changed:
blocks/recent_activity/tests/behat/structural_changes.feature
blocks/social_activities/tests/behat/edit_activities.feature
course/moodleform_mod.php
course/tests/behat/activities_visibility_icons.feature
course/tests/behat/section_visibility.feature
lang/en/calendar.php
lib/blocklib.php
lib/classes/plugin_manager.php
lib/db/install.xml
lib/db/services.php
lib/db/upgrade.php
lib/upgrade.txt
mod/assign/lang/en/assign.php
mod/assign/lib.php
mod/assign/locallib.php
mod/data/lib.php
mod/data/tests/lib_test.php
mod/feedback/lib.php
mod/forum/lib.php
mod/forum/tests/behat/forum_subscriptions_availability.feature
mod/label/tests/behat/label_visibility.feature
mod/lesson/lib.php
mod/lti/lib.php
mod/quiz/lib.php
mod/scorm/lib.php
mod/survey/lib.php
theme/bootstrapbase/style/moodle.css
version.php