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

Merge remote-tracking branch 'origin/develop' into riot_1860_2

Browse Source 
# Conflicts:
#	Riot/Utils/Widgets/WidgetManager.m
This commit is contained in:
manuroe
2018-05-29 16:10:53 +02:00
parent 5f199d6a8a 38ba63d916
commit 13cab8724d
16 changed files with 421 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/ViewController/RoomViewController.m
+1 -1
View File
@@ -3725,7 +3725,7 @@
inRoom:self.roomDataSource.room].count;
if (includeUserWidgets)
{
widgetsCount = [[WidgetManager sharedManager] userWidgets:self.roomDataSource.room.mxSession].count;
widgetsCount += [[WidgetManager sharedManager] userWidgets:self.roomDataSource.room.mxSession].count;
}
return widgetsCount;