Merge branch 'wip-MDL-57769-master' of https://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Apr 2017 23:31:08 +0000 (01:31 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Apr 2017 23:31:08 +0000 (01:31 +0200)
1  2 
backup/util/ui/tests/behat/restore_moodle2_courses.feature
blocks/section_links/tests/behat/block_section_links_course.feature
course/externallib.php
course/format/topics/tests/behat/edit_delete_sections.feature
course/format/weeks/tests/behat/edit_delete_sections.feature
course/lib.php
course/tests/behat/activities_visibility_icons.feature
course/tests/courselib_test.php
course/tests/externallib_test.php
lang/en/moodle.php