Sylvain 2c8001f38f Merge branch 'projects' into dev ...

Conflicts:
	app/views/api/members/show.json.jbuilder

2016-07-13 15:57:45 +02:00

..

deploy

release 2.0 rc

2016-03-23 18:39:41 +01:00

environments

update jbuilder and add cache in progress

2016-06-20 19:41:05 +02:00

initializers

Merge remote-tracking branch 'origin/open-api' into dev

2016-06-27 16:31:50 +02:00

locales

Merge branch 'projects' into dev

2016-07-13 15:57:45 +02:00

application.rb

Merge remote-tracking branch 'origin/open-api' into dev

2016-06-27 16:31:50 +02:00

application.yml.default

ui projects list

2016-05-02 16:10:48 +02:00

boot.rb

init depot fabmanager

2015-05-05 03:10:25 +02:00

database.yml.default

update database name in database.yml.default

2016-04-05 12:36:55 +02:00

deploy.rb

release 2.0 rc

2016-03-23 18:39:41 +01:00

environment.rb

init depot fabmanager

2015-05-05 03:10:25 +02:00

nginx_puma.conf

release 2.0 rc

2016-03-23 18:39:41 +01:00

nginx_staging.conf

release 2.0 rc

2016-03-23 18:39:41 +01:00

nginx.conf

release 2.0 rc

2016-03-23 18:39:41 +01:00

routes.rb

Merge remote-tracking branch 'origin/open-api' into dev

2016-06-27 16:31:50 +02:00

schedule.yml

Merge remote-tracking branch 'origin/open-api' into dev

2016-06-27 16:31:50 +02:00

secrets.yml

prepare app to receive navi_gami plugin

2016-05-26 15:14:56 +02:00

sidekiq.yml

release 2.0 rc

2016-03-23 18:39:41 +01:00

unicorn_init_staging.sh

release 2.0 rc

2016-03-23 18:39:41 +01:00

unicorn_init.sh

release 2.0 rc

2016-03-23 18:39:41 +01:00

unicorn_staging.rb

release 2.0 rc

2016-03-23 18:39:41 +01:00

unicorn.rb

release 2.0 rc

2016-03-23 18:39:41 +01:00