diff options
| author | Erik Johnston <erik@matrix.org> | 2017-02-27 16:40:11 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-02-27 16:40:11 +0000 |
| commit | 8a6196c6c85a0d5aa716749b98d55b74c4435d76 (patch) | |
| tree | e974ec6975011b6beec4f1b636aa7fc826af4c0c /.gitignore | |
| parent | Local changes (diff) | |
| parent | Merge pull request #1954 from matrix-org/erikj/cache_device2 (diff) | |
| download | synapse-2017-02-27.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes 2017-02-27
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions