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
..
admin	Merge branch 'master' into registry-623	2018-03-29 12:13:59 +03:00
api	Improve tests	2018-03-06 11:05:08 +02:00
epp	Improve tests	2018-03-06 11:05:08 +02:00
registrant	Fix test	2018-01-19 13:33:56 +02:00
registrar	Rename attributes	2018-03-13 11:32:15 +02:00