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

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

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

..

Alchemy/Phrasea

Merge branch '3.8'

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

classes

Fix latest merge

2014-02-04 13:44:38 +01:00

conf.d

Merge branch '3.8'

2014-02-03 19:02:22 +01:00

Fixtures

Rename files

2012-09-19 15:39:29 +02:00

autoload.php

Update autoloader path

2013-05-31 11:40:52 +02:00