Gil Eluard d9a75c1928 Merge branch 'gil/5225_invite_to_space_in_room_landing' into gil/5224_space_creation ...

# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Images.swift
#	Riot/Generated/Strings.swift

2021-12-14 11:00:02 +01:00

..

Assets

Merge branch 'gil/5225_invite_to_space_in_room_landing' into gil/5224_space_creation

2021-12-14 09:53:07 +01:00

Categories

Update all Objective-C MatrixKit imports to handle new location.

2021-11-30 16:09:53 +01:00

Coordinators

Fix class keyword deprecation warnings everywhere!

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

Generated

Merge branch 'gil/5225_invite_to_space_in_room_landing' into gil/5224_space_creation

2021-12-14 11:00:02 +01:00

Managers

vector-im/element-ios/issues/5114 - Polls in the timeline.

2021-12-09 09:37:02 +02:00

Model

Merge develop into steve/5020_matrixkit_merge

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

Modules

Merge branch 'gil/5225_invite_to_space_in_room_landing' into gil/5224_space_creation

2021-12-14 09:53:07 +01:00

PropertyWrappers

Fix compiler issue

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

Routers

Invite to Space in room landing #5225

2021-12-08 23:21:55 +01:00

SupportingFiles

Invite to Space in room landing #5225

2021-12-08 23:21:55 +01:00

Utils

Merge develop into steve/5020_matrixkit_merge

2021-11-30 16:16:52 +01: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