Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Add resources.consent conditional dependency back #8107

Merged
merged 3 commits into from
Aug 18, 2020
Merged

Add resources.consent conditional dependency back #8107

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba1b3a9
Add resources.consent conditional dependency back
anoadragon453 Aug 18, 2020
329b2e7
Add changelog
anoadragon453 Aug 18, 2020
b7b62cc
Remove resources.consent and all checking code
anoadragon453 Aug 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/8107.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Use the default template file when its equivalent is not found in a custom template directory.
1 change: 1 addition & 0 deletions synapse/python_dependencies.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
"matrix-synapse-ldap3": ["matrix-synapse-ldap3>=0.1"],
# we use execute_batch, which arrived in psycopg 2.7.
"postgres": ["psycopg2>=2.7"],
"resources.consent": [],
# ACME support is required to provision TLS certificates from authorities
# that use the protocol, such as Let's Encrypt.
"acme": [
Expand Down