felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-20 16:42:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

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
Download Patch File Download Diff File Expand all files Collapse all files
Riot/SupportingFiles/Riot-Bridging-Header.h
+1
View File
@@ -50,6 +50,7 @@
#import "RoomTimelineCellProvider.h"
#import "PlainRoomTimelineCellProvider.h"
#import "BubbleRoomTimelineCellProvider.h"
#import "RoomSelectedStickerBubbleCell.h"
// MatrixKit common imports, shared with all targets
#import "MatrixKit-Bridging-Header.h"