mirror of
https://mau.dev/maunium/synapse.git
synced 2024-09-04 08:32:29 +00:00
Merge branch 'develop' into client_v2_sync
Conflicts: synapse/rest/client/v2_alpha/__init__.py
This commit is contained in:
commit
14ff33bd93
6
.gitignore
vendored
6
.gitignore
vendored
@ -35,3 +35,9 @@ uploads
|
|||||||
|
|
||||||
.idea/
|
.idea/
|
||||||
media_store/
|
media_store/
|
||||||
|
|
||||||
|
*.tac
|
||||||
|
|
||||||
|
build/
|
||||||
|
|
||||||
|
localhost-800*/
|
||||||
|
@ -5,7 +5,7 @@ logger = logging.getLogger(__name__)
|
|||||||
|
|
||||||
REQUIREMENTS = {
|
REQUIREMENTS = {
|
||||||
"syutil==0.0.2": ["syutil"],
|
"syutil==0.0.2": ["syutil"],
|
||||||
"matrix_angular_sdk==0.6.0": ["syweb==0.6.0"],
|
"matrix_angular_sdk==0.6.0": ["syweb>=0.6.0"],
|
||||||
"Twisted>=14.0.0": ["twisted>=14.0.0"],
|
"Twisted>=14.0.0": ["twisted>=14.0.0"],
|
||||||
"service_identity>=1.0.0": ["service_identity>=1.0.0"],
|
"service_identity>=1.0.0": ["service_identity>=1.0.0"],
|
||||||
"pyopenssl>=0.14": ["OpenSSL>=0.14"],
|
"pyopenssl>=0.14": ["OpenSSL>=0.14"],
|
||||||
|
Loading…
Reference in New Issue
Block a user