Gil Eluard 18d064c752 Merge branch 'develop' into gil/5231_SP3-1_Update_room_settings_for_Spaces ...

# Conflicts:
#	Riot/Generated/Strings.swift
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/SupportingFiles/Riot-Bridging-Header.h
#	RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift

2021-12-27 11:48:36 +01:00

..

Assets

Merge branch 'develop' into gil/5231_SP3-1_Update_room_settings_for_Spaces

2021-12-27 11:48:36 +01:00

Categories

SP2: Adding Rooms to Spaces element-ios#5230

2021-12-23 14:08:00 +01:00

Coordinators

Fix class keyword deprecation warnings everywhere!

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

Generated

Merge branch 'develop' into gil/5231_SP3-1_Update_room_settings_for_Spaces

2021-12-27 11:48:36 +01:00

Managers

Merge branch 'develop' into gil/5231_SP3-1_Update_room_settings_for_Spaces

2021-12-27 11:48:36 +01:00

Model

Merge develop into steve/5020_matrixkit_merge

2021-11-30 16:16:52 +01:00

Modules

Merge branch 'develop' into gil/5231_SP3-1_Update_room_settings_for_Spaces

2021-12-27 11:48:36 +01:00

PropertyWrappers

Fix compiler issue

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

Routers

SP2: Adding Rooms to Spaces element-ios#5230

2021-12-23 14:08:00 +01:00

SupportingFiles

Merge branch 'develop' into gil/5231_SP3-1_Update_room_settings_for_Spaces

2021-12-27 11:48:36 +01:00

Utils

Address most PR comments.

2021-12-16 17:01:23 +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

Riot target: Exclude markdown files from MatrixKit folder.

2021-11-29 17:20:17 +01:00