diff options
author | Amber Brown <hawkowl@atleastfornow.net> | 2018-10-22 22:18:02 +1100 |
---|---|---|
committer | Amber Brown <hawkowl@atleastfornow.net> | 2018-10-22 22:18:02 +1100 |
commit | ead471e72df700036a3085c2403cf2307f08d2d8 (patch) | |
tree | 833f31c14824e339fe038bfd5713dfb639288be5 /setup.py | |
parent | Merge branch 'develop' into matrix-org-hotfixes (diff) | |
parent | uh, Matrix is called Matrix these days... (diff) | |
download | synapse-ead471e72df700036a3085c2403cf2307f08d2d8.tar.xz |
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
Diffstat (limited to 'setup.py')
-rwxr-xr-x | setup.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/setup.py b/setup.py |