Mathieu Darse 5b24664001 Merge branch 'master' into elastic-indexer ...

Conflicts:
	bin/console

2014-10-15 12:18:44 +02:00

..

bower

Fix latest merge

2014-10-13 12:58:20 +02:00

nginx

Update directory structure & allow to configure paths (tmp, log, cache)

2014-09-05 15:57:00 +02:00

phraseanet

Set back the logger on Elasticsearch client, not pleased with the format

2014-09-22 11:34:14 +02:00