 JanNiklas Grabowski
|
1768fb5eee
|
Merge commit 'aaadcc73674cc8886e363693a7d7c08ac9b4f516' into feature/4260_merge_foss_1_10_2
# Conflicts:
# Config/AppVersion.xcconfig
# Podfile
# Podfile.lock
# Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved
# Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift
# Riot/Modules/Application/LegacyAppDelegate.m
# Riot/Modules/Authentication/AuthenticationCoordinator.swift
# Riot/Modules/Authentication/Legacy/LegacyAuthenticationCoordinator.swift
# Riot/Modules/ContextMenu/ActionProviders/RoomActionProvider.swift
# Riot/Modules/Home/AllChats/AllChatsViewController.swift
# Riot/Modules/Room/RoomInfo/RoomInfoCoordinator.swift
# Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
# Riot/Modules/Room/Settings/RoomSettingsViewController.m
# fastlane/Fastfile
|
2023-02-15 14:56:55 +01:00 |
|
 Andy Uhnak
|
559644cfe6
|
Display backup import progress
|
2023-02-02 16:42:49 +00:00 |
|
 Frank Rotermund
|
226e55caf7
|
MESSENGER-3304 string in separate files
|
2022-09-19 11:53:45 +02:00 |
|
 manuroe
|
641025fac4
|
Key Backup: Add a screen for recovering with the local private key
|
2020-04-08 15:52:04 +02:00 |
|
|
manuroe
|
f7112a5698
|
Key Backup: Add a screen for recovering with the local private key
|
2020-04-08 15:52:04 +02:00 |
|