Artur Beljajev 837f326ef6 Merge branch 'master' into registry-623 ... # Conflicts: # app/controllers/admin/registrars_controller.rb # app/models/registrar.rb # app/views/admin/registrars/_billing.html.erb # app/views/admin/registrars/show.html.erb # config/locales/admin/registrars.en.yml # config/locales/en.yml # db/migrate/20180309053424_add_registrars_unique_constraints.rb # db/structure.sql # test/fixtures/registrars.yml # test/integration/admin/registrars/delete_test.rb # test/integration/admin/registrars/new_test.rb # test/models/registrar_test.rb		2018-03-29 12:13:59 +03:00
..
data	Admin contact statuses management #2477	2015-07-22 13:37:30 +03:00
migrate	Merge branch 'master' into registry-623	2018-03-29 12:13:59 +03:00
api_log_schema.rb	Update log DB schema	2016-12-28 17:10:12 +02:00
seeds.rb	Move initial setup from seeds.rb to bootstrap rake task	2017-05-14 19:29:58 +03:00
structure.sql	Merge branch 'master' into registry-623	2018-03-29 12:13:59 +03:00
whois_schema.rb	Refactored whois_body to whois_record	2015-04-24 16:43:07 +03:00