JanNiklas Grabowski 787c1211a0 Merge commit 'ba936df9dff7039634397670f5a18bd1be8da222' into feature/5706_show_federation_info ...

* commit 'ba936df9dff7039634397670f5a18bd1be8da222':
  MESSENGER-5575 spelling
  MESSENGER-5575 use sdk with fixed event mapping
  MESSENGER-5575 ACL status event handling in the timeline
  MESSENGER-5575 decide first ACL event based on state
  MESSENGER-5570 build fix strigntables in NSE
  MESSENGER-5570 build with correct sdk
  MESSENGER-5570 acl status events up to collapsability

# Conflicts:
#	Riot/Assets/de.lproj/Bwi.strings
#	Riot/Assets/en.lproj/Bwi.strings
#	Riot/Generated/BWIStrings.swift

2024-03-01 15:55:15 +01:00

..

BWIStrings.swift

Merge commit 'ba936df9dff7039634397670f5a18bd1be8da222' into feature/5706_show_federation_info

2024-03-01 15:55:15 +01:00

Images.swift

Merge branch 'develop' into 'feature/5575_acl_status_in_timeline'

2024-03-01 12:29:59 +00:00

RiotDefaults.swift

Remove plist and unused SwiftGen config and generated file

2022-07-04 15:54:52 +02:00

Storyboards.swift

Merge commit '5d625330b03d7fad12bdb5482b3c3fe19c32be88' into feature/basis_merge_1824

2022-09-19 11:31:20 +02:00

Strings.swift

MESSENGER-5159 add releasenotes

2023-09-29 13:42:16 +02:00

UntranslatedStrings.swift

Release 1.9.10 (#7019)

2022-11-01 14:14:46 +03:00