element-ios/Riot/Assets/en.lproj
Gil Eluard 8fa0a673d6 Merge branch 'develop' into gil/SP1_space_creation
# Conflicts:
#	Riot/Modules/People/PeopleViewController.m
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Spaces/SpaceList/SpaceListViewModel.swift
2022-02-21 17:20:58 +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 'develop' into gil/SP1_space_creation 2022-02-21 17:20:58 +01:00