Nicolas Le Goff 7eb1a506fa Merge branch '3.8' ...

Conflicts:
	.gitignore
	.travis.yml
	Vagrantfile
	lib/Alchemy/Phrasea/Controller/Datafiles.php
	lib/Alchemy/Phrasea/Controller/Setup.php
	lib/Alchemy/Phrasea/Helper/DatabaseHelper.php
	lib/classes/connection/pdo.php
	lib/classes/task/period/subdef.php
	lib/classes/task/period/writemeta.php
	locale/de_DE/LC_MESSAGES/phraseanet.mo
	locale/de_DE/LC_MESSAGES/phraseanet.po
	locale/en_GB/LC_MESSAGES/phraseanet.mo
	locale/en_GB/LC_MESSAGES/phraseanet.po
	locale/fr_FR/LC_MESSAGES/phraseanet.mo
	locale/fr_FR/LC_MESSAGES/phraseanet.po
	locale/nl_NL/LC_MESSAGES/phraseanet.mo
	locale/nl_NL/LC_MESSAGES/phraseanet.po
	locale/phraseanet.pot
	templates/web/setup/step2.html.twig
	vagrant/vms/phraseanet-php54-nginx/puphpet/config.yaml
	vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-always/setup
	vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-once/setup
	vagrant/vms/phraseanet-php54-nginx/puphpet/shell/important-notices.txt
	vagrant/vms/phraseanet-php54-nginx/puphpet/shell/self-promotion.txt

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

..

AbstractEditor.php

Bump copyright year

2014-01-06 15:40:56 +01:00

ArchiveEditor.php

Fix configuration usage

2014-02-22 10:39:07 +01:00

DefaultEditor.php

Fix configuration usage

2014-02-22 10:39:07 +01:00

EditorInterface.php

Fix configuration usage

2014-02-22 10:39:07 +01:00

FtpEditor.php

Fix configuration usage

2014-02-22 10:39:07 +01:00

FtpPullEditor.php

Fix configuration usage

2014-02-22 10:39:07 +01:00

PhraseanetIndexerEditor.php

Fix configuration usage

2014-02-22 10:39:07 +01:00

RecordMoverEditor.php

Fix configuration usage

2014-02-22 10:39:07 +01:00

SubdefsEditor.php

Fix configuration usage

2014-02-22 10:39:07 +01:00

WriteMetadataEditor.php

Merge branch '3.8'

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