element-ios/Riot/Assets/en.lproj
Gil Eluard 443401838f Merge branch 'develop' into gil/5231_SP3-1_Update_room_settings_for_Spaces
# Conflicts:
#	Riot/Generated/Strings.swift
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/SupportingFiles/Riot-Bridging-Header.h
#	RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
2021-12-27 11:48:36 +01:00
..
InfoPlist.strings Update the Service Terms modal from the latest Figma. 2021-09-13 11:46:31 +01:00
Localizable.strings Update from feedback. 2021-08-18 12:32:32 +01:00
Vector.strings Merge branch 'develop' into gil/5231_SP3-1_Update_room_settings_for_Spaces 2021-12-27 11:48:36 +01:00