Merge branch 'master' into registry-569

# Conflicts:
#	app/controllers/admin/contacts_controller.rb
This commit is contained in:
Artur Beljajev 2017-09-11 17:09:58 +03:00
commit e4740f3f32
40 changed files with 1287 additions and 1236 deletions

View file

@ -1,16 +1,17 @@
en:
admin:
menu:
users: Users
api_users: API users
admin_users: Admin users
prices: Prices
archive: Archive
domain_history: Domain history
contact_history: Contact history
zones: Zones
blocked_domains: Blocked domains
reserved_domains: Reserved domains
epp_log: EPP log
repp_log: REPP log
que: Que
base:
menu:
users: Users
api_users: API users
admin_users: Admin users
prices: Prices
archive: Archive
domain_history: Domain history
contact_history: Contact history
zones: Zones
blocked_domains: Blocked domains
reserved_domains: Reserved domains
epp_log: EPP log
repp_log: REPP log
que: Que