rgarcia dde1d34172 fixes conflicts with master

2017-01-05 01:56:35 +01:00

..

deploy

sets only one server to run delayed jobs

2016-12-28 21:24:56 +01:00

environments

…

initializers

fixes conflicts with master

2017-01-05 01:56:35 +01:00

locales

fixes conflicts with master

2017-01-05 01:56:35 +01:00

application_custom.rb

…

application.rb

…

boot.rb

…

database.yml.example

…

deploy-secrets.yml.example

…

deploy.rb

sets only one server to run delayed jobs

2016-12-28 21:24:56 +01:00

environment.rb

…

i18n-tasks.yml

Merge branch 'master' into budgets

2016-12-27 14:02:12 +01:00

newrelic.yml

…

routes.rb

Adds new route and matching ability for administrators

2016-12-28 17:42:47 +01:00

schedule.rb

…

secrets.yml.example

…

sitemap.rb

…