Gil Eluard 1153e2ec6f Merge branch 'gil/5231_SP3-1_Update_room_settings_for_Spaces' into gil/5232_SP3-2_Long_press_on_rooms_in_space_room_lists ...

# Conflicts:
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewModel.swift
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoomCoordinator.swift

2022-02-06 21:22:28 +01:00

..

Assets

Merge branch 'gil/5231_SP3-1_Update_room_settings_for_Spaces' into gil/5232_SP3-2_Long_press_on_rooms_in_space_room_lists

2022-02-06 21:22:28 +01:00

Categories

Merge branch gil/SP1_space_creation into gil/5230_SP2-Adding_Rooms_to_Spaces

2022-02-04 16:43:43 +01:00

Coordinators

Fix class keyword deprecation warnings everywhere!

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

Generated

Merge branch 'gil/5231_SP3-1_Update_room_settings_for_Spaces' into gil/5232_SP3-2_Long_press_on_rooms_in_space_room_lists

2022-02-06 21:22:28 +01:00

Managers

Merge branch gil/SP1_space_creation into gil/5230_SP2-Adding_Rooms_to_Spaces

2022-02-04 16:43:43 +01:00

Model

vector-im/element-ios/issues/5298 - Add .well-known configuration support for tile server and map styles.

2022-02-04 11:33:55 +02:00

Modules

Merge branch 'gil/5231_SP3-1_Update_room_settings_for_Spaces' into gil/5232_SP3-2_Long_press_on_rooms_in_space_room_lists

2022-02-06 21:22:28 +01:00

PropertyWrappers

Fix compiler issue

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

Routers

Merge branch gil/SP1_space_creation into gil/5230_SP2-Adding_Rooms_to_Spaces

2022-02-04 16:43:43 +01:00

SupportingFiles

Merge branch 'develop' into gil/SP1_space_creation

2022-02-04 14:29:57 +01:00

Utils

Display redacted events only if threads enabled

2022-01-28 04:31:44 +03: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 Indonesian and Slovak languages.

2022-01-27 10:37:53 +00:00