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

This commit is contained in:
Andres Keskküla 2014-12-19 13:47:17 +02:00
commit e33ab4dce9
44 changed files with 238 additions and 150 deletions

View file

@ -439,3 +439,7 @@ en:
domains_history: Domains history
admin_users: Admin users
epp_users: EPP users
role: 'Role'
admin: 'Administrator'
user: 'User'
customer_service: 'Customer service'

View file

@ -31,6 +31,8 @@ Rails.application.routes.draw do
resources :delayed_jobs
resource :dashboard
root 'domains#index'
end