zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-18 10:19:45 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
# 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
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/application_controller.rb
View file

@ -32,7 +32,7 @@ class ApplicationController < ActionController::Base
if registrar_request?
registrar_root_url
elsif registrant_request?
registrant_root_url
registrant_login_url
elsif admin_request?
admin_root_url
end