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