Merge branch 'm36_MDL-63789_Search_SOLR_Fixes_Proxy_Auth' of https://github.com/scara...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 6 Nov 2018 23:08:12 +0000 (00:08 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 6 Nov 2018 23:08:12 +0000 (00:08 +0100)

Trivial merge