diff options
author | Erik Johnston <erik@matrix.org> | 2015-07-09 11:55:52 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-07-09 11:55:52 +0100 |
commit | 4019b48aaa2f107887d911909bcd4cadcd828e48 (patch) | |
tree | c853d6dd17c3aa2f419332ec0283aaeca6af7b29 /synapse/streams | |
parent | Change format of receipts to allow inclusion of data (diff) | |
parent | We don't want semicolons. (diff) | |
download | synapse-4019b48aaa2f107887d911909bcd4cadcd828e48.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts
Diffstat (limited to 'synapse/streams')
0 files changed, 0 insertions, 0 deletions