summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2015-08-26 13:42:45 +0100
committerDaniel Wagner-Hall <daniel@matrix.org>2015-08-26 13:42:45 +0100
commitd3c0e488591386b7d24d23c6f6d3b237523fca89 (patch)
treea0d8c139b8ec3087421ff039902088980d4534f8 /synapse/api
parentMerge pull request #251 from matrix-org/removeadmin (diff)
downloadsynapse-d3c0e488591386b7d24d23c6f6d3b237523fca89.tar.xz
Merge erikj/user_dedup to develop
Diffstat (limited to 'synapse/api')
0 files changed, 0 insertions, 0 deletions