Gil Eluard 1891aed59e Merge branch 'gil/SP1_space_creation' into gil/5225_invite_to_space_in_room_landing ...

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

2022-01-26 10:55:05 +01:00

..

Images.swift

Merge branch 'gil/SP1_space_creation' into gil/5225_invite_to_space_in_room_landing

2022-01-26 10:55:05 +01:00

MatrixKitStrings.swift

vector-im/element-ios/issues/5298 - Disable forwarding for location messages and allow replies.

2022-01-04 17:33:32 +02:00

RiotDefaults.swift

Fixes #4881 - Replaced InfoPlist.cfBundleDisplayName with AppInfo.current.displayName and removed the now unused InfoPlist generated class.

2021-09-22 16:59:47 +03:00

Storyboards.swift

Invite to Space in room landing #5225

2021-12-13 22:16:02 +01:00

Strings.swift

Merge branch 'gil/SP1_space_creation' into gil/5225_invite_to_space_in_room_landing

2022-01-26 10:55:05 +01:00