element-ios/Riot/SupportingFiles
Gil Eluard f9a1fdfe85 Merge branch 'develop' into gil/SP1_space_creation
# Conflicts:
#	Riot/Modules/Room/RoomCoordinatorBridgePresenter.swift
#	Riot/Modules/Room/RoomCoordinatorParameters.swift
#	Riot/Modules/Room/RoomViewController.m
#	Riot/Modules/TabBar/TabBarCoordinator.swift
2022-02-04 14:29:57 +01:00
..
empty.mm Create physical SupportingFiles folder 2018-07-10 10:21:21 +02:00
Info.plist vector-im/element-ios/issues/5298 - Improved error messages and moved map configuration to the BuildSettings 2022-01-04 17:33:32 +02:00
Riot-Bridging-Header.h Merge branch 'develop' into gil/SP1_space_creation 2022-02-04 14:29:57 +01:00
Riot.entitlements Merge branch 'develop' into element_3483 2020-08-06 11:38:25 +03:00