Merge branch 'MDL-61102-master' of https://github.com/sammarshallou/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 19 Apr 2018 08:37:30 +0000 (10:37 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 19 Apr 2018 08:37:30 +0000 (10:37 +0200)
1  2 
search/classes/output/form/search.php
search/index.php

Simple merge
Simple merge