Justus Moroni 2b56d4c2d5 Merge branch 'develop' into feature/75-make-index-configurable ... # Conflicts: # Documentation/source/configuration/connections.rst # Documentation/source/connections.rst		2018-05-17 23:51:55 +02:00
..
Elasticsearch	Merge branch 'develop' into feature/75-make-index-configurable	2018-05-17 23:51:55 +02:00