diff options
author | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-10-06 09:55:21 -0500 |
---|---|---|
committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-10-06 09:55:21 -0500 |
commit | ca6496c27c7219827826a58adf3d13c13c6cd53f (patch) | |
tree | 89b32bcf6e8e7b0357c209f2906f42e71d1e5277 /tox.ini | |
parent | Merge branch 'develop' into daniel/3pidinvites (diff) | |
parent | Use space not dash as delimiter (diff) | |
download | synapse-ca6496c27c7219827826a58adf3d13c13c6cd53f.tar.xz |
Merge branch 'daniel/useragent' into daniel/3pidinvites
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions