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

Conflicts:
	app/assets/stylesheets/shared/general.sass
This commit is contained in:
Martin Lensment 2015-04-21 13:23:50 +03:00
commit dbbc6b3bff
58 changed files with 552 additions and 322 deletions

View file

@ -10,11 +10,11 @@ class Epp::DomainsController < EppController
case @hosts
when 'del'
@nameservers = @domain.delegated_nameservers
@nameservers = @domain.delegated_nameservers.sort
when 'sub'
@nameservers = @domain.subordinate_nameservers
@nameservers = @domain.subordinate_nameservers.sort
when 'all'
@nameservers = @domain.nameservers
@nameservers = @domain.nameservers.sort
end
render_epp_response '/epp/domains/info'