Artur Beljajev e5cdb2e8db Merge branch 'master' into refactor-devise-integration ... # Conflicts: # app/controllers/registrant/contacts_controller.rb # config/routes.rb		2018-07-10 18:09:03 +03:00
..
admin	Refactor Devise integration	2018-06-20 12:21:22 +03:00
api	Move affected domains to the top of the hash, update integration test	2018-07-05 17:53:03 +03:00
epp	Merge branch 'master' into registry-662	2018-04-18 17:33:00 +03:00
registrant	Replace Warden test helpers with Devise ones	2018-06-19 19:40:35 +03:00
registrar	Merge branch 'master' into refactor-devise-integration	2018-07-10 18:09:03 +03:00