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

@ -21,6 +21,7 @@
= render 'setting_row', var: :dnskeys_max_count
= render 'setting_row', var: :ns_min_count
= render 'setting_row', var: :ns_max_count
= render 'setting_row', var: :expire_pending_confirmation
.panel.panel-default
.panel-heading.clearfix