Merge branch 'MDL-60913-search-tabs-master' of https://github.com/dmitriim/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Jan 2019 17:55:47 +0000 (18:55 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Jan 2019 17:55:47 +0000 (18:55 +0100)
1  2 
admin/settings/plugins.php
course/tests/search_test.php
lang/en/admin.php
lang/en/search.php

Simple merge
Simple merge
Simple merge
Simple merge