Arnfried Griesert 4727a3ddf2 Fixed merge conflicts

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

..

Assets

merged element-ios 1.10.5 into 4409_basis_update_1_10_5

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

Categories

merged element-ios 1.10.5 into 4409_basis_update_1_10_5

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

Coordinators

…

Experiments

CryptoSDK phased rollout feature

2023-02-22 11:25:28 +00:00

Generated

merged element-ios 1.10.5 into 4409_basis_update_1_10_5

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

Managers

merged element-ios 1.10.5 into 4409_basis_update_1_10_5

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

Model

merged element-ios 1.10.5 into 4409_basis_update_1_10_5

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

Modules

Fixed merge conflicts

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

PropertyWrappers

…

Routers

The theme defined in the application is not applied to all UI components (#6532)

2022-08-05 15:00:22 +02:00

SupportingFiles

Release 2.0.0

2022-11-27 13:18:53 +00:00

Utils

Merge branch 'release/v.2.3.0' into develop

2023-02-16 16:29:24 +01:00

Common.xcconfig

Stop using an ephemeral web browser session on SSO (#6464)

2022-07-27 12:13:31 +01:00

Debug.xcconfig

…

Release.xcconfig

…

target-bum-beta.yml

Release 2.0.0

2022-11-27 13:18:53 +00:00

target-messenger.yml

Release 2.0.0

2022-11-27 13:18:53 +00:00

target.yml

merged element-ios 1.10.5 into 4409_basis_update_1_10_5

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