Files
bundesmessenger-ios/Riot/Utils
Frank Rotermund ec12c42c54 Merge branch 'master' of https://github.com/vector-im/element-ios into feature/3269_merge_element_1_8_18
# Conflicts:
#	Config/AppIdentifiers.xcconfig
#	Config/AppVersion.xcconfig
#	Podfile
#	Podfile.lock
#	Riot/Assets/de.lproj/Vector.strings
#	Riot/Generated/Images.swift
#	Riot/Modules/Analytics/DecryptionFailureTracker.m
#	Riot/Modules/Application/LegacyAppDelegate.h
#	Riot/Modules/Onboarding/OnboardingCoordinator.swift
#	Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
#	Riot/Modules/Room/RoomViewController.m
#	Riot/SupportingFiles/Info.plist
#	Riot/Utils/EventFormatter.m
#	Riot/Utils/Tools.h
#	Riot/Utils/Tools.m
#	Riot/target.yml
#	RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
#	fastlane/Fastfile
#	project.yml
2022-06-12 19:49:46 +02:00
..
2020-10-27 15:27:27 +01:00
2021-12-16 17:01:23 +00:00
2021-12-16 17:01:23 +00:00
2021-12-16 17:01:23 +00:00
2022-05-09 15:55:24 +02:00
2022-04-27 11:55:23 +02:00
2021-07-06 23:03:56 +02:00