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 |
|