Merge branch 'master' into add_groups

2018-12-13 16:28:34 +01:00
parent b137e64020 6c46566174
commit 2c29bf4e2b
47 changed files with 253 additions and 116 deletions
--- a/app/models/external_user.rb
+++ b/app/models/external_user.rb
@ -10,5 +10,4 @@ class ExternalUser < User
      name
    end
  end
-
 end