diff options
author | Kegan Dougal <kegan@matrix.org> | 2014-09-15 15:27:58 +0100 |
---|---|---|
committer | Kegan Dougal <kegan@matrix.org> | 2014-09-15 15:27:58 +0100 |
commit | 14bc4ed59f0d98e80db96ed8232983f814082305 (patch) | |
tree | 27e70665764b41f5f16f8662eb1328e2ba20aba7 /.gitignore | |
parent | Update spec to include m.login.email.identity (diff) | |
parent | Correctly handle the 'age' key in events and pdus (diff) | |
download | synapse-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