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

Merge branch 'rebranding' into 15-code-refactoring-constants

Browse Source 
# Conflicts:
#	Riot/Assets/Riot-Defaults.plist
This commit is contained in:
SBiOSoftWhare
2020-07-08 17:45:27 +02:00
parent a717fd7e96 ccce619751
commit 0df2d07b59
122 changed files with 515 additions and 528 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Generated/RiotDefaults.swift
+3
View File
@@ -37,6 +37,9 @@ internal enum RiotDefaults {
internal static let pusherAppIdDev: String = _document["pusherAppIdDev"]
internal static let pusherAppIdProd: String = _document["pusherAppIdProd"]
internal static let roomDirectoryServers: [String: Any] = _document["roomDirectoryServers"]
internal static let settingsCopyrightUrl: String = _document["settingsCopyrightUrl"]
internal static let settingsPrivacyPolicyUrl: String = _document["settingsPrivacyPolicyUrl"]
internal static let settingsTermsConditionsUrl: String = _document["settingsTermsConditionsUrl"]
internal static let showAllEventsInRoomHistory: Bool = _document["showAllEventsInRoomHistory"]
internal static let showLeftMembersInRoomMemberList: Bool = _document["showLeftMembersInRoomMemberList"]
internal static let showRedactionsInRoomHistory: Bool = _document["showRedactionsInRoomHistory"]