Files
bundesmessenger-ios/Riot/Categories
Frank Rotermund 67dd4f918e Merge commit '35b2fdc538dfc1f8fac2585704526ab26148a9ab' into feature/3977_merge_element_1_9_13
# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile.lock
#	Riot/Modules/Application/LegacyAppDelegate.m
#	Riot/Modules/Authentication/AuthenticationCoordinator.swift
#	Riot/Modules/Authentication/Legacy/LegacyAuthenticationCoordinator.swift
#	Riot/Modules/LaunchLoading/LaunchLoadingView.swift
#	Riot/Modules/LaunchLoading/LaunchLoadingView.xib
#	Riot/Modules/MatrixKit/Models/Account/MXKAccount.m
#	Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleCellData.m
#	Riot/Modules/Room/TimelineCells/Styles/Bubble/BubbleRoomTimelineCellProvider.m
#	Riot/Modules/Room/TimelineCells/Styles/Plain/PlainRoomTimelineCellProvider.m
#	Riot/Modules/TabBar/MasterTabBarController.m
#	fastlane/Fastfile
2022-12-19 14:36:30 +01:00
..
2022-11-09 14:59:35 +02:00
2022-10-18 16:09:06 +03:00
2022-11-01 14:14:46 +03:00
2022-05-03 12:48:01 +02:00
2022-06-17 10:19:10 +02:00
2022-06-17 10:19:10 +02:00
2022-10-18 16:09:06 +03:00
2019-02-27 10:07:51 +01:00
2022-10-18 16:09:06 +03:00
2022-06-16 10:27:44 +02:00
2022-06-13 21:42:07 +03:00
2022-11-01 14:14:46 +03:00
2022-11-01 14:14:46 +03:00