Vladimir Krylov fe930c7535 Merge branch '104525318-history_import' into staging ... # Conflicts: # Gemfile # app/models/domain.rb # config/locales/en.yml		2016-03-04 14:48:41 +02:00
..
environments	generate assets when missed	2016-02-03 16:13:12 +02:00
initializers	Merge remote-tracking branch 'origin/master' into 105846070-merge-with-105842700-arireg-for-registrant-port	2016-02-15 10:11:07 +02:00
locales	Merge branch '104525318-history_import' into staging	2016-03-04 14:48:41 +02:00
application-example.yml	Merge remote-tracking branch 'origin/master' into 104525318-history_import	2016-03-04 14:21:22 +02:00
application.rb	105842700-download_list_added	2015-12-06 20:47:34 +02: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	Transfer should add copy_from_id	2015-09-10 14:49:37 +03:00
database-example-registrant.yml	Added registrant database example	2015-05-18 12:51:10 +03:00
database-example.yml	Added registrant database example	2015-05-18 12:51:10 +03:00
database-robot.yml	Updated robot database yml	2015-07-17 15:25:40 +03:00
database-travis.yml	Added travis database yml	2015-02-20 18:19:11 +02:00
deploy-example.rb	Update deploy example #2925	2015-09-17 18:18:38 +03:00
environment.rb	rails new	2014-06-10 11:43:04 +03:00
newrelic.yml	New relic fallback to old license key #2711	2015-06-26 16:14:06 +03:00
routes.rb	Merge branch '105842700-registrants_portal' into staging	2016-02-17 17:54:07 +02:00
schedule.rb	Merge branch 'master' into 110395650-domain_crons	2016-02-01 12:02:44 +02:00
secrets-example.yml	Update config examples with alpha and staging envs	2015-01-16 13:35:03 +02:00
spring.rb	Move spring conf under conf dir #2711	2015-06-26 16:57:06 +03:00
unicorn.rb	Log all activerecord and activemodel user issues #2808	2015-07-23 16:51:32 +03:00