mirror of
https://github.com/internetee/registry.git
synced 2025-07-22 18:56:05 +02:00
Fix merge conflicts
This commit is contained in:
commit
8a046b59bf
210 changed files with 5560 additions and 1569 deletions
|
@ -110,6 +110,7 @@ class Ability
|
|||
can :create, :zonefile
|
||||
can :access, :settings_menu
|
||||
can :manage, :mass_actions
|
||||
can :manage, BouncedMailAddress
|
||||
end
|
||||
|
||||
def static_registrant
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue