# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 1586525546 -7200
# Node ID 84487755bb2e48ef6a744cebe01fb1f217547325
# Parent  f8314738030acb33612de960df046621fed43803# Parent  b1b1f69b1f28bac4becbf4123c8b889bfe644b00
Merge stable

diff -r f8314738030a -r 84487755bb2e kallithea/model/db.py
--- a/kallithea/model/db.py	Sun Nov 03 16:39:59 2019 +0100
+++ b/kallithea/model/db.py	Fri Apr 10 15:32:26 2020 +0200
@@ -820,8 +820,8 @@
     users_group_to_perm = relationship('UserGroupToPerm', cascade='all')
     users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
     users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
-    user_user_group_to_perm = relationship('UserUserGroupToPerm ', cascade='all')
-    user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
+    user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
+    user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
 
     owner = relationship('User')