mirror of
https://github.com/vector-im/element-ios.git
synced 2024-09-30 16:22:39 +00:00
f9a1fdfe85
# Conflicts: # Riot/Modules/Room/RoomCoordinatorBridgePresenter.swift # Riot/Modules/Room/RoomCoordinatorParameters.swift # Riot/Modules/Room/RoomViewController.m # Riot/Modules/TabBar/TabBarCoordinator.swift |
||
---|---|---|
.. | ||
empty.mm | ||
Info.plist | ||
Riot-Bridging-Header.h | ||
Riot.entitlements |