Gil Eluard 2a09ca3947 Merge branch 'develop' into gil/5225_invite_to_space_in_room_landing ...

# Conflicts:
#	Riot/Modules/Room/RoomCoordinator.swift

2021-12-13 15:09:40 +01:00

..

Views

Update all Objective-C MatrixKit imports to handle new location.

2021-11-30 16:09:53 +01:00

InviteFriendsPresenter.swift

Invite friends: Make app name customizable in share text.

2021-01-12 11:34:05 +01:00

PeopleViewController.h

Remove old conformances.

2021-07-27 14:53:58 +01:00

PeopleViewController.m

Merge branch 'develop' into gil/5225_invite_to_space_in_room_landing

2021-12-13 15:09:40 +01:00