diff options
author | Erik Johnston <erik@matrix.org> | 2016-08-02 09:56:31 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-08-02 09:56:31 +0100 |
commit | 733bf442901b256a7dc6a206b912f80a127b1eb3 (patch) | |
tree | 1ef6aab444cc4343db257dc373ddf5d918a98371 /.gitignore | |
parent | Make jenkins dendron test federation read apis (diff) | |
parent | Merge pull request #970 from matrix-org/erikj/clock (diff) | |
download | synapse-733bf442901b256a7dc6a206b912f80a127b1eb3.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_reader
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions