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 xcode11

Browse Source 
# Conflicts:
#	CHANGES.rst
#	Riot.xcodeproj/project.pbxproj
This commit is contained in:
ismailgulek
2020-06-26 17:33:09 +03:00
parent 5b316ff87c 12cef0d64d
commit b1acd2ad24
110 changed files with 6705 additions and 515 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/StartChat/StartChatViewController.m
+1 -1
View File
@@ -564,7 +564,7 @@
[[AppDelegate theDelegate] showErrorAsAlert:error];
};
[self.mainSession canEnableE2EByDefaultInNewRoomWithUsers:inviteArray success:^(BOOL canEnableE2E) {
[self.mainSession vc_canEnableE2EByDefaultInNewRoomWithUsers:inviteArray success:^(BOOL canEnableE2E) {
MXStrongifyAndReturnIfNil(self);
// Create new room