Frank Rotermund 1ab51f37f8 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

..

Logs

Add Tools/Logs/filterStartupLogs.sh

2019-10-25 14:23:08 +02:00

Release

BuildRelease.sh: Add an option to build the ipa from local source code copy

2021-12-09 13:46:33 +01:00

SwiftGen

Fix UI Tests and run on PRs

2022-04-21 12:54:53 +01:00

Templates

MESSENGER-2762 Initial Merge

2022-03-17 15:51:23 +01:00

XcodeGen

postGenCommand.sh: Add comments.

2021-07-30 17:28:52 +02:00