Merge branch 'MDL-53813-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 26 Apr 2016 02:13:24 +0000 (10:13 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 26 Apr 2016 02:13:24 +0000 (10:13 +0800)
1  2 
search/classes/output/form/search.php

Simple merge