 Gil Eluard
|
da9c921efb
|
Merge branch 'develop' into gil/SP1_space_creation
# Conflicts:
# Config/BuildSettings.swift
# Riot/Generated/Strings.swift
# Riot/Modules/Home/HomeViewController.m
# Riot/Modules/Room/Members/RoomParticipantsViewController.m
|
2022-03-04 13:38:18 +01:00 |
|
|
Gil Eluard
|
40fdba0cc1
|
SP1.2: Invite to Space in room landing element-ios#5225
- Update after review
|
2022-02-03 23:44:07 +01:00 |
|
|
Gil Eluard
|
bfea80a234
|
Update Riot/Modules/Room/ParticipantsInviteModal/ContactsPicker/RoomInviteViewController.swift
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
|
2022-02-03 20:59:44 +01:00 |
|
|
Gil Eluard
|
98a83783cc
|
Update Riot/Modules/Room/ParticipantsInviteModal/ContactsPicker/ContactsPickerViewModel.swift
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
|
2022-02-03 20:56:47 +01:00 |
|
|
Gil Eluard
|
0cb94a0659
|
Invite to Space in room landing #5225
- added room option bottom sheet
|
2021-12-13 22:16:02 +01:00 |
|