diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-19 15:19:37 +0100 |
|---|---|---|
| committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-19 15:19:37 +0100 |
| commit | ecc59ae66ef8e0b491a3ade89f363238abccaab8 (patch) | |
| tree | 0a8f6b85ccbc42a7e02b9995ee58f13181fe240a /synapse/federation | |
| parent | Re-add whitespace around caveat operators (diff) | |
| parent | hacky support for video for FS CC DD (diff) | |
| download | synapse-ecc59ae66ef8e0b491a3ade89f363238abccaab8.tar.xz | |
Merge branch 'master' into auth
Diffstat (limited to 'synapse/federation')
0 files changed, 0 insertions, 0 deletions