Gil Eluard 9432d72e20 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

..

InfoPlist.strings

vector-im/element-ios/issues/5298 - Improved error messages and moved map configuration to the BuildSettings

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

Localizable.strings

vector-im/element-ios/issues/5298 - Custom notification text for shared locations.

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

Vector.strings

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

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