Daniel Siepmann 89065305c4 Merge branch 'feature/add-display-name-to-facet' into feature/cleanup ... Conflicts: Classes/Connection/Elasticsearch/FacetOption.php Classes/Connection/FacetOptionInterface.php		2018-03-08 07:51:44 +01:00
..
Functional	Merge pull request #101 from Codappix/feature/phpcs-travis	2018-03-06 15:11:46 +01:00
Unit	Merge branch 'feature/add-display-name-to-facet' into feature/cleanup	2018-03-08 07:51:44 +01:00