summary refs log tree commit diff
path: root/demo
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-08-26 17:50:08 +0100
committerKegan Dougal <kegan@matrix.org>2014-08-26 17:50:08 +0100
commit73a1022bcad98883a5ab80dbe7e68460d58c3de5 (patch)
tree8ccec4c3752deede87488a29d73db238bcfa9087 /demo
parentFeedback: Removed FeedbackRestServlet. Modified keys on FeedbackEvent. Expand... (diff)
parentMerge branch 'client_server_url_rename' into develop (diff)
downloadsynapse-73a1022bcad98883a5ab80dbe7e68460d58c3de5.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into client_server_url_rename
Diffstat (limited to 'demo')
0 files changed, 0 insertions, 0 deletions