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:45:06 +0100
committerDaniel Wagner-Hall <daniel@matrix.org>2015-08-26 13:45:06 +0100
commit37f0ddca5fd932e091449f68b44428597dc8a309 (patch)
treeecd7714e4979d723d4cafe71623223a0e5ad5fd2 /synapse/api
parentAttempt to validate macaroons (diff)
parentMerge erikj/user_dedup to develop (diff)
downloadsynapse-37f0ddca5fd932e091449f68b44428597dc8a309.tar.xz
Merge branch 'mergeeriksmadness' into auth
Diffstat (limited to 'synapse/api')
0 files changed, 0 insertions, 0 deletions