mirror of
https://github.com/vector-im/element-ios.git
synced 2024-09-28 23:32:41 +00:00
f9a1fdfe85
# Conflicts: # Riot/Modules/Room/RoomCoordinatorBridgePresenter.swift # Riot/Modules/Room/RoomCoordinatorParameters.swift # Riot/Modules/Room/RoomViewController.m # Riot/Modules/TabBar/TabBarCoordinator.swift |
||
---|---|---|
.. | ||
InfoPlist.strings | ||
Localizable.strings | ||
Vector.strings |