Artur Beljajev e4740f3f32 Merge branch 'master' into registry-569 ... # Conflicts: # app/controllers/admin/contacts_controller.rb		2017-09-11 17:09:58 +03:00
..
admin	Merge branch 'master' into registry-569	2017-09-11 17:09:58 +03:00
concerns/shared	Refactor user to admin and api user	2015-02-13 16:17:06 +02:00
epp	Improve "account_activities" DB table structure	2017-05-07 14:05:32 +03:00
registrant	skip client.logger in TEST env	2017-04-12 16:02:22 +03:00
registrar	Improve Ident validation, extract Ident from Contact	2017-08-18 13:24:56 +03:00
application_controller.rb	115595167-matching_column_name_changed	2016-04-14 17:22:18 +03:00
epp_controller.rb	Remove debug message	2017-08-08 21:27:04 +03:00
registrant_controller.rb	TEMP	2015-05-21 11:24:44 +03:00