Merge branch 'master' of github.com:domify/registry

Conflicts:
	config/locales/en.yml
This commit is contained in:
Martin Lensment 2015-07-15 11:31:14 +03:00
commit e722da3ed8
22 changed files with 249 additions and 34 deletions

View file

@ -56,7 +56,8 @@ class Admin::SettingsController < AdminController
:days_to_keep_overdue_invoices_active,
:days_to_renew_domain_before_expire,
:expire_warning_period,
:redemption_grace_period
:redemption_grace_period,
:expire_pending_confirmation
]
floats = [:registry_vat_prc]