Merge branch 'MDL-60880-master' of https://github.com/sammarshallou/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 6 Dec 2017 02:07:58 +0000 (10:07 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 6 Dec 2017 06:53:37 +0000 (19:53 +1300)
commit97812f14c1bb7d70d80cd483f58e44ac37d3cd50
tree5ac6a496696ec04284759544ebd36185997ff840
parente3b699eab7290fd6377d19319182e034b04b3d87
parent7f9fb2c846d4086b18b5e4e157aa36f9a4074126
Merge branch 'MDL-60880-master' of https://github.com/sammarshallou/moodle
search/classes/manager.php
search/tests/fixtures/mock_search_area.php
search/tests/manager_test.php