Mike Ng 2c75dc654f Merge remote-tracking branch 'alchemy/master' into PHRAS-1734_PORT_PHRAS-1589 ...

# Conflicts:
#	resources/locales/messages.de.xlf
#	resources/locales/messages.en.xlf
#	resources/locales/messages.fr.xlf
#	resources/locales/messages.nl.xlf
#	resources/locales/validators.de.xlf
#	resources/locales/validators.en.xlf
#	resources/locales/validators.fr.xlf
#	resources/locales/validators.nl.xlf

2018-01-09 09:50:27 +04:00

..

ansible

Merge branch 'master-alchemy' into PHRAS-1735_add_git_log

2018-01-08 16:26:28 +04:00

examples

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

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

gulp

Merge branch 'PHRAS-1745_PORT_custom_links' into PHRAS-1735_add_git_log

2018-01-08 16:37:46 +04:00

hudson

Replace app['phraseanet.appbox']->get_databox using trait

2015-07-02 12:27:26 +02:00

locales

Merge remote-tracking branch 'alchemy/master' into PHRAS-1734_PORT_PHRAS-1589

2018-01-09 09:50:27 +04:00

proxies

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

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

vagrant/config

Move setting to registry and form type

2016-09-28 20:58:26 +02:00

www

Merge branch 'PHRAS-1745_PORT_custom_links' into PHRAS-1735_add_git_log

2018-01-08 16:37:28 +04:00