Artur Beljajev dfdce5dedc Merge branch 'master' into registry-475 ... # Conflicts: # app/models/billing/price.rb # spec/models/billing/price_spec.rb		2017-06-15 09:39:14 +03:00
..
admin	Merge branch 'master' into registry-475	2017-06-15 09:39:14 +03:00
epp	Replace SERVER_DELETE_PROHIBITED with PENDING_UPDATE on EPP domain:update	2017-05-31 19:48:16 +03:00
registrar	Move sign_in_to_registrar_area helper to session helpers	2017-04-12 14:25:03 +03:00