Arnaud Ringenbach 5ab06d9f18 Merge branch 'develop' into aringenbach/5745_mandatory_secure_backup ...

# Conflicts:
#	Riot/Modules/CreateRoom/EnterNewRoomDetails/EnterNewRoomDetailsViewModel.swift

2022-03-10 10:35:20 +01:00

..

Assets

Merge pull request #5748 from vector-im/gil/SP1_space_creation

2022-03-10 10:18:48 +01:00

Categories

Merge branch 'develop' into aringenbach/5745_mandatory_secure_backup

2022-03-10 10:35:20 +01:00

Coordinators

Fix class keyword deprecation warnings everywhere!

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

Generated

Merge branch 'develop' into gil/SP1_space_creation

2022-03-08 11:23:55 +01:00

Managers

Merge pull request #5748 from vector-im/gil/SP1_space_creation

2022-03-10 10:18:48 +01:00

Model

Update WellKnown & HomeserverConfiguration for mandatory backup

2022-03-09 10:40:33 +01:00

Modules

Merge branch 'develop' into aringenbach/5745_mandatory_secure_backup

2022-03-10 10:35:20 +01: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

Merge branch 'develop' into gil/SP1_space_creation

2022-03-04 13:38:18 +01:00

Utils

Small change

2022-03-09 13:34:18 +00:00

Common.xcconfig

Improve the Obj-C Generated Interface Header Name definition

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

Debug.xcconfig

XcodeGen: Use same names for yml and xcconfig files in every target

2021-02-11 09:21:00 +01:00

Release.xcconfig

XcodeGen: Use same names for yml and xcconfig files in every target

2021-02-11 09:21:00 +01:00

target.yml

Add missing languages.

2022-03-07 12:10:16 +00:00