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
concerns/shared	Refactor user to admin and api user	2015-02-13 16:17:06 +02:00
epp	Hide methods	2018-02-19 23:35:37 +02:00
registrant	Encapsulate methods	2018-01-11 15:55:15 +02:00
registrar	Merge branch 'master' into registry-623	2018-03-29 12:13:59 +03:00
application_controller.rb	Remove unused method	2018-01-22 15:02:47 +02:00
epp_controller.rb	Remove unused constant	2018-02-19 05:18:41 +02:00
registrant_controller.rb	TEMP	2015-05-21 11:24:44 +03:00