Fix merge conflicts

This commit is contained in:
Karl Erik Õunapuu 2020-12-28 11:39:13 +02:00
commit 8a046b59bf
No known key found for this signature in database
GPG key ID: C9DD647298A34764
210 changed files with 5560 additions and 1569 deletions

View file

@ -110,6 +110,7 @@ class Ability
can :create, :zonefile
can :access, :settings_menu
can :manage, :mass_actions
can :manage, BouncedMailAddress
end
def static_registrant