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

Merge branch 'develop' into gil/SP1_space_creation

Browse Source 
# Conflicts:
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Room/RoomViewController.m
#	Riot/Modules/Room/Settings/RoomSettingsViewController.h
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
This commit is contained in:
Gil Eluard
2022-03-08 11:23:55 +01:00
parent cf015c4ef2 acf7d0de13
commit cdd66146d8
82 changed files with 515 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/Settings/RoomSettingsViewController.h
+2 -2
View File
@@ -19,7 +19,7 @@
#import "MediaPickerViewController.h"
#import "TableViewCellWithCheckBoxes.h"
@class AnalyticsScreenTimer;
@class AnalyticsScreenTracker;
@protocol RoomSettingsViewControllerDelegate;
/**
@@ -58,7 +58,7 @@ typedef enum : NSUInteger {
/**
The screen timer used for analytics if they've been enabled. The default value is nil.
*/
@property (nonatomic) AnalyticsScreenTimer *screenTimer;
@property (nonatomic) AnalyticsScreenTracker *screenTracker;
/**
Delegate of this view controller.