Merge branch 'MDL-59039-master' of https://github.com/sammarshallou/moodle
authorDavid Monllao <david.monllao@gmail.com>
Tue, 11 Jul 2017 19:49:03 +0000 (21:49 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Tue, 11 Jul 2017 19:49:03 +0000 (21:49 +0200)
1  2 
lang/en/admin.php
search/classes/base.php
search/classes/manager.php
search/tests/manager_test.php

Simple merge
Simple merge
Simple merge
Simple merge