Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-30 08:12:40 +00:00
Code Issues Projects Releases Packages Wiki Activity
element-ios/Riot/Modules/Room/Settings
History
Gil Eluard 996ef72498 Merge branch 'develop' into gil/SP1_space_creation 
# Conflicts:
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Room/RoomViewController.m
#	Riot/Modules/Room/Settings/RoomSettingsViewController.h
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
2022-03-08 11:23:55 +01:00
..
Views Merge branch 'gil/SP1_space_creation' into gil/5231_SP3-1_Update_room_settings_for_Spaces 2022-02-21 17:57:58 +01:00
RoomSettingsViewController.h Merge branch 'develop' into gil/SP1_space_creation 2022-03-08 11:23:55 +01:00
RoomSettingsViewController.m Merge branch 'develop' into gil/SP1_space_creation 2022-03-08 11:23:55 +01:00