Nicolas Le Goff 3b9b5a3240 Merge branch '3.8' ...

Conflicts:
	lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php

2014-02-05 15:25:52 +01:00

..

Elastic

Add elastic-search engine support

2014-01-27 20:12:13 +01:00

Phrasea

Merge branch '3.8'

2014-02-05 15:25:52 +01:00

SphinxSearch

Merge branch '3.8'

2014-02-05 15:25:52 +01:00

AbstractConfigurationPanel.php

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

ConfigurationPanelInterface.php

Bump copyright year

2014-01-06 15:28:12 +01:00

SearchEngineInterface.php

Merge branch '3.8'

2014-02-05 15:25:52 +01:00

SearchEngineLogger.php

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

SearchEngineOptions.php

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

SearchEngineResult.php

Bump copyright year

2014-01-06 15:28:12 +01:00

SearchEngineSuggestion.php

Merge branch '3.8'

2014-01-06 15:38:14 +01:00