mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-05-03 07:44:48 -04:00
Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
Conflicts: setup.py
This commit is contained in:
commit
cde840a82c
27 changed files with 1422 additions and 20 deletions
1
setup.py
1
setup.py
|
@ -42,6 +42,7 @@ setup(
|
|||
"daemonize",
|
||||
"py-bcrypt",
|
||||
"frozendict>=0.4",
|
||||
"pillow",
|
||||
],
|
||||
dependency_links=[
|
||||
"https://github.com/matrix-org/syutil/tarball/v0.0.2#egg=syutil-0.0.2",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue