Frank Rotermund 54dc0322f0 Merge commit 'b1847a3ae552c52c06ab4934318dbdb2cf1d8c4b' into feature/4884_merge_foss_1.10.14 ...

# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile.lock
#	Riot/Modules/Home/AllChats/AllChatsCoordinator.swift
#	fastlane/.env.default
#	fastlane/Fastfile

2023-07-04 08:24:05 +02:00

..

AnalyticsPrompt

Merge commit '8b96dce52c015ca629dea38c32307cddbcd2577c' into feature/4260_merge_foss_1_10_2

2023-02-15 14:56:55 +01:00

Authentication

Feature/4889 deactivate rust for prod

2023-06-28 05:59:03 +00:00

Common

MESSENGER-4769 color changes part 2

2023-06-20 11:32:09 +00:00

LocationSharing

Fixed merge conflicts

2023-03-20 07:33:28 +01:00

Onboarding

MESSENGER-4769 color changes part 2

2023-06-20 11:32:09 +00:00

Room

Merge commit 'b1847a3ae552c52c06ab4934318dbdb2cf1d8c4b' into feature/4884_merge_foss_1.10.14

2023-07-04 08:24:05 +02:00

Settings

Merge commit 'b1847a3ae552c52c06ab4934318dbdb2cf1d8c4b' into feature/4884_merge_foss_1.10.14

2023-07-04 08:24:05 +02:00

Spaces

merged element-ios 1.10.5 into 4409_basis_update_1_10_5

2023-03-16 12:19:26 +01:00

Template

merged element-ios 1.10.5 into 4409_basis_update_1_10_5

2023-03-16 12:19:26 +01:00

UserSessions

Merge commit 'b1847a3ae552c52c06ab4934318dbdb2cf1d8c4b' into feature/4884_merge_foss_1.10.14

2023-07-04 08:24:05 +02:00