Artur Beljajev 5b821f4074 Merge branch 'master' into registry-790 ... # Conflicts: # app/models/domain_cron.rb # lib/tasks/dev.rake		2018-06-18 16:27:56 +03:00
..
environments	Merge pull request #864 from internetee/add-uglifier-gem	2018-06-14 17:59:59 +03:00
initializers	Merge pull request #869 from internetee/remove-monkey-patch	2018-06-14 19:23:06 +03:00
locales	Merge branch 'master' into registry-790	2018-06-06 21:53:08 +03:00
application-example.yml	Merge branch 'master' into credit-and-debit-card-payments	2018-06-04 11:06:29 +03:00
application.rb	Remove lib folder from autoload path	2018-06-05 17:26:14 +03:00
boot.rb	rails new	2014-06-10 11:43:04 +03:00
daemons.yml	Que log/pid moved to log/que #2724	2015-07-16 19:23:49 +03:00
database-example-development.yml	Remove unused "registrant_write_" keys from database config examples	2017-04-12 18:29:04 +03:00
database-example-registrant.yml	Remove unused "registrant_write_" keys from database config examples	2017-04-12 18:29:04 +03:00
database-example.yml	Config for test and development docker containers	2018-04-13 15:44:19 +03:00
database-travis.yml	Remove unused "registrant_write_" keys from database config examples	2017-04-12 18:29:04 +03:00
deploy-example.rb	Story#120259603 - git uses right branch last commit message	2016-05-25 10:13:10 +03:00
environment.rb	rails new	2014-06-10 11:43:04 +03:00
puma.rb	Copy "puma" gem config from Rails 5	2018-06-09 04:37:03 +03:00
routes.rb	Merge branch 'master' into registry-790	2018-06-18 16:27:56 +03:00
schedule.rb	Merge branch 'master' into registry-790	2018-04-15 19:11:20 +03:00
spring.rb	Move spring conf under conf dir #2711	2015-06-26 16:57:06 +03:00