Arnfried Griesert 07f92763c6 removed merge conflicts

2022-05-03 12:56:08 +02:00

..

Assets

merged element 1.8.10

2022-05-03 12:48:01 +02:00

Categories

merged element 1.8.10

2022-05-03 12:48:01 +02:00

Coordinators

Fix class keyword deprecation warnings everywhere!

2021-07-09 17:05:43 +01:00

Generated

merged element 1.8.10

2022-05-03 12:48:01 +02:00

Managers

merged element 1.8.10

2022-05-03 12:48:01 +02:00

Model

Remove KeyPreSharingStrategy support

2022-03-16 14:17:46 +01:00

Modules

merged element 1.8.10

2022-05-03 12:48:01 +02:00

PropertyWrappers

Fix compiler issue

2021-10-05 14:08:05 +03:00

Routers

SP2: Adding Rooms to Spaces #523o

2022-02-17 14:02:52 +01:00

SupportingFiles

merged element 1.8.10

2022-05-03 12:48:01 +02:00

Utils

merged element 1.8.10

2022-05-03 12:48:01 +02:00

Common.xcconfig

Improve the Obj-C Generated Interface Header Name definition

2021-10-26 17:42:33 +02:00

Debug.xcconfig

…

Release.xcconfig

…

target-messenger.yml

MESSENGER-2762 Initial Merge

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

target.yml

removed merge conflicts

2022-05-03 12:56:08 +02:00