Merge branch 'wip-MDL-58915-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 19 Oct 2017 13:44:07 +0000 (15:44 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 19 Oct 2017 13:44:07 +0000 (15:44 +0200)
1  2 
search/engine/solr/classes/engine.php

Simple merge