summary refs log tree commit diff
path: root/.gitignore
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-09-15 15:27:58 +0100
committerKegan Dougal <kegan@matrix.org>2014-09-15 15:27:58 +0100
commit14bc4ed59f0d98e80db96ed8232983f814082305 (patch)
tree27e70665764b41f5f16f8662eb1328e2ba20aba7 /.gitignore
parentUpdate spec to include m.login.email.identity (diff)
parentCorrectly handle the 'age' key in events and pdus (diff)
downloadsynapse-14bc4ed59f0d98e80db96ed8232983f814082305.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into registration-api-changes in preparation for re-merge to develop.
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions