Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert security exception #1053

Merged
merged 2 commits into from
May 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions TCHAP_CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Changes in Tchap 2.11.3 (2024-05-14)

Features ✨
----------
- Activation des appels vocaux pour toutes les instances. ([#1043](https://github.com/tchapgouv/tchap-android/issues/1043))
- Activation des appels vocaux pour toutes les instances en beta externe. ([#1043](https://github.com/tchapgouv/tchap-android/issues/1043))

Other changes
-------------
Expand All @@ -23,7 +23,7 @@ Changes in Tchap 2.11.2 (2024-04-30)

Features ✨
----------
- Activation des appels vocaux pour les instances Diplomatie et Finances ([#1038](https://github.com/tchapgouv/tchap-android/issues/1038))
- Activation des appels vocaux pour les instances Diplomatie et Finances en beta externe ([#1038](https://github.com/tchapgouv/tchap-android/issues/1038))

Improvements 🙌
--------------
Expand Down
1 change: 0 additions & 1 deletion changelog.d/1049.bugfix

This file was deleted.

2 changes: 1 addition & 1 deletion towncrier.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tool.towncrier]
version = "2.11.4"
version = "2.11.5"
directory = "changelog.d"
filename = "TCHAP_CHANGES.md"
name = "Changes in Tchap"
Expand Down
2 changes: 1 addition & 1 deletion vector-app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ ext.versionMinor = 11
// Note: even values are reserved for regular release, odd values for hotfix release.
// When creating a hotfix, you should decrease the value, since the current value
// is the value for the next regular release.
ext.versionPatch = 4
ext.versionPatch = 5

static def getGitTimestamp() {
def cmd = 'git show -s --format=%ct'
Expand Down
1 change: 0 additions & 1 deletion vector/src/withpinning/res/xml/network_security_config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
<!-- Allow system certificates for firebase if used. No effect on FDroid variant -->
<domain-config cleartextTrafficPermitted="false">
<domain includeSubdomains="false">firebaseinstallations.googleapis.com</domain>
<domain includeSubdomains="false">openmaptiles.github.io</domain>
<trust-anchors>
<certificates src="system" />
</trust-anchors>
Expand Down
Loading