summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorLuke Barnard <luke@matrix.org>2018-04-05 16:49:22 +0100
committerLuke Barnard <luke@matrix.org>2018-04-06 15:43:27 +0100
commit87c864b6984f6876f224e0d4ac2e2b872d2723ce (patch)
tree186407692119c9d20b2e41ea466eb1f7b30066c9 /synapse
parentis_joinable -> join_rule (diff)
downloadsynapse-87c864b6984f6876f224e0d4ac2e2b872d2723ce.tar.xz
join_rule -> join_policy
Diffstat (limited to 'synapse')
-rw-r--r--synapse/storage/group_server.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/group_server.py b/synapse/storage/group_server.py
index d81609dd16..8bd8ca8124 100644
--- a/synapse/storage/group_server.py
+++ b/synapse/storage/group_server.py
@@ -57,7 +57,7 @@ class GroupServerStore(SQLBaseStore):
             },
             retcols=(
                 "name", "short_description", "long_description",
-                "avatar_url", "is_public", "join_rule",
+                "avatar_url", "is_public", "join_policy",
             ),
             allow_none=True,
             desc="get_group",