Files
bundesmessenger-ios/Riot/Modules/CreateRoom
Gil Eluard a8bcd8faa2 Merge branch 'develop' into gil/5230_SP2-Adding_Rooms_to_Spaces
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift
#	Riot/SupportingFiles/Riot-Bridging-Header.h
#	RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
2022-01-17 20:40:12 +01:00
..