Mike Ng 3dd4c50350 Merge branch 'master-alchemy' into PHRAS-1735_add_git_log ...

# Conflicts:
#	resources/www/common/js/components/common.js

2018-01-08 16:26:28 +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

modify gulp task to copy embed-bundle/dist from vendor

2017-08-07 14:20:02 +04:00

hudson

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

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

locales

Merge pull request #2383 from mike-esokia/PHRAS-1736_PORT-165_and_1593

2018-01-08 12:12:20 +01: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 'master-alchemy' into PHRAS-1735_add_git_log

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