Artur Beljajev e4740f3f32 Merge branch 'master' into registry-569 ... # Conflicts: # app/controllers/admin/contacts_controller.rb		2017-09-11 17:09:58 +03:00
..
billing/prices	Fix translations	2017-08-22 12:42:03 +03:00
contacts	Improve Ident validation, extract Ident from Contact	2017-08-18 13:24:56 +03:00
dns/zones	Fix translations	2017-08-22 12:42:03 +03:00
domains	Refactor domain force delete, add "death" force delete mailer template	2017-01-23 04:16:59 +02:00
registrars	Fix registrar spec	2017-02-22 10:24:56 +02:00