felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-17 23:18:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#   Riot/Assets/de.lproj/Bwi.strings
#   Riot/Assets/en.lproj/Bwi.strings
This commit is contained in:
Frank Rotermund
2024-03-01 12:29:59 +00:00
parent c5703f8861 385ee21774
commit 784c31ce02
25 changed files with 619 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Riot/Generated/Images.swift
View File

@@ -58,6 +58,11 @@ internal class Asset: NSObject {
internal static let federationPillEnBumLight = ImageAsset(name: "federation_pill_en_bum_light")
internal static let fileAttachmentIcon = ImageAsset(name: "file_attachment_icon")
internal static let fileScanInfected = ImageAsset(name: "file_scan_infected")
internal static let introduceFederation1Dark = ImageAsset(name: "introduce_federation_1_dark")
internal static let introduceFederation1Light = ImageAsset(name: "introduce_federation_1_light")
internal static let introduceFederation2Dark = ImageAsset(name: "introduce_federation_2_dark")
internal static let introduceFederation2Light = ImageAsset(name: "introduce_federation_2_light")
internal static let introduceFederation3 = ImageAsset(name: "introduce_federation_3")
internal static let newFeatures = ImageAsset(name: "new_features")
internal static let qrcodeViewfinder = ImageAsset(name: "qrcode_viewfinder")
internal static let roomFederatedBumIconDark = ImageAsset(name: "room_federated_bum_icon_dark")