Skip to content

Commit

Permalink
Merge branch 'release/2.13.11'
Browse files Browse the repository at this point in the history
  • Loading branch information
yostyle committed Nov 15, 2024
2 parents b2440b1 + dc64ab6 commit d317599
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
5 changes: 5 additions & 0 deletions TCHAP_CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Changes in Tchap 2.13.11 (2024-11-15)
=====================================

No significant changes.

Changes in Tchap 2.13.10 (2024-11-15)
=====================================

Expand Down
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.13.10"
version = "2.13.11"
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 = 13
// 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 = 10
ext.versionPatch = 11

static def getGitTimestamp() {
def cmd = 'git show -s --format=%ct'
Expand Down
2 changes: 1 addition & 1 deletion vector-config/src/tchap/res/values/config-features.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<bool name="tchap_is_cross_signing_enabled">true</bool>
<bool name="tchap_is_key_backup_enabled">true</bool>
<bool name="tchap_is_thread_enabled">false</bool>
<bool name="tchap_is_secure_backup_required">false</bool>
<bool name="tchap_is_secure_backup_required">true</bool>

<string-array name="tchap_is_visio_supported_homeservers" translatable="false">
<item>agent.dinum.tchap.gouv.fr</item>
Expand Down

0 comments on commit d317599

Please sign in to comment.