Damien Alexandre 5f7edb5be9 Merge branch 'master' into elastic-indexer ...

Conflicts:
	.gitignore

2014-10-06 18:24:58 +02:00

..

bower

Improve VM build

2014-09-08 16:35:58 +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