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

Merge branch 'gil/SP1_space_creation' into gil/5225_invite_to_space_in_room_landing

Browse Source 
# Conflicts:
#	Riot/Generated/Strings.swift
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift
#	Riot/SupportingFiles/Riot-Bridging-Header.h
This commit is contained in:
Gil Eluard
2022-01-24 19:36:02 +01:00
parent 4fdc43ff93 535af1caf3
commit b9512352a6
494 changed files with 13663 additions and 2679 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/SupportingFiles/Riot-Bridging-Header.h
+4 -1
View File
@@ -46,6 +46,10 @@
#import "NSArray+Element.h"
#import "ShareItemSender.h"
#import "Contact.h"
#import "HTMLFormatter.h"
#import "RoomTimelineCellProvider.h"
#import "PlainRoomTimelineCellProvider.h"
#import "BubbleRoomTimelineCellProvider.h"
// MatrixKit common imports, shared with all targets
#import "MatrixKit-Bridging-Header.h"
@@ -63,4 +67,3 @@
#import "MXKRoomDataSourceManager.h"
#import "MXRoom+Sync.h"
#import "UIAlertController+MatrixKit.h"
#import "MXKAnalyticsConstants.h"