Merge remote-tracking branch 'origin/105846070-merge-with-105842700-arireg-for-registrant-port' into staging

# Conflicts:
#	app/models/domain.rb
This commit is contained in:
Vladimir Krylov 2016-01-18 13:09:53 +02:00
commit 5473f72d7f
37 changed files with 2059 additions and 30 deletions

View file

@ -59,6 +59,7 @@ class Admin::SettingsController < AdminController
:transfer_wait_time,
:invoice_number_min,
:invoice_number_max,
:days_to_keep_business_registry_cache,
:days_to_keep_invoices_active,
:days_to_keep_overdue_invoices_active,
:days_to_renew_domain_before_expire,