diff options
| author | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-10-05 20:52:15 -0500 |
|---|---|---|
| committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-10-05 20:52:15 -0500 |
| commit | ddd079c8f8127b5ef9f12b1c1d9387bd9f34d74b (patch) | |
| tree | e88b15f55f6b46c19c8f3c4506489723d08b0977 /setup.py | |
| parent | Revert "Merge pull request #283 from matrix-org/erikj/atomic_join_federation" (diff) | |
| parent | Preserve version string in user agent (diff) | |
| download | synapse-ddd079c8f8127b5ef9f12b1c1d9387bd9f34d74b.tar.xz | |
Merge branch 'daniel/useragent' into daniel/3pidinvites
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions