fixes conflicts with master

2016-07-19 14:49:27 +02:00
parent 4ebd9bf0e9 075c6c24b9
commit f24a8887bb
167 changed files with 6212 additions and 967 deletions
--- a/app/models/abilities/everyone.rb
+++ b/app/models/abilities/everyone.rb
@@ -11,6 +11,7 @@ module Abilities
      can :read, User
      can [:search, :read], Annotation
      can [:read], Budget
+      can :new, DirectMessage
    end
  end
 end