Merge remote-tracking branch 'origin/108869472-objects_archive' into story/115762063--show-historical-nested

# Conflicts:
#	app/controllers/admin/domain_versions_controller.rb
#	config/locales/en.yml
This commit is contained in:
Vladimir Krylov 2016-03-22 16:03:52 +02:00
commit 5cce1ed2c8
13 changed files with 632 additions and 3 deletions

View file

@ -95,6 +95,7 @@ class Ability
can :manage, ReservedDomain
can :manage, ZonefileSetting
can :manage, DomainVersion
can :manage, ContactVersion
can :manage, Pricelist
can :manage, User
can :manage, ApiUser