Merge branch 'develop' into gil/SP1_space_creation

Browse Source

# Conflicts:
#	Riot/Modules/Room/RoomCoordinatorBridgePresenter.swift
#	Riot/Modules/Room/RoomCoordinatorParameters.swift
#	Riot/Modules/Room/RoomViewController.m
#	Riot/Modules/TabBar/TabBarCoordinator.swift

...

This commit is contained in:

Gil Eluard

2022-02-04 14:29:57 +01:00

parent 62ae581330 f0cef72d73

commit 0ae38858da

445 changed files with 17297 additions and 2207 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Riot/Modules/Room/RoomViewController.m

+783 -239

File diff suppressed because it is too large Load Diff