Robbie Averill d6a119ce20 Merge branch '3'
# Conflicts:
 #	composer.json
 #	src/Solr/Tasks/Solr_Configure.php
2019-03-25 13:24:04 +13:00
..
2019-03-25 13:24:04 +13:00