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

Merge branch 'develop' into flescio/1040-poll_detail

Browse Source 
# Conflicts:
#	Riot/Generated/Strings.swift
#	RiotSwiftUI/Modules/Room/PollHistory/Coordinator/PollHistoryCoordinator.swift
#	RiotSwiftUI/Modules/Room/PollHistory/PollHistoryModels.swift
#	RiotSwiftUI/Modules/Room/PollHistory/PollHistoryViewModel.swift
This commit is contained in:
Flavio Alescio
2023-01-27 15:22:15 +01:00
parent 21eafa2383 4e7ce652d4
commit 4e4ad5074c
22 changed files with 445 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Assets/en.lproj/Vector.strings
+1
View File
@@ -2304,6 +2304,7 @@ Tap the + to start adding people.";
"poll_history_no_past_poll_period_text" = "There are no past polls for the past %@ days. Load more polls to view polls for previous months";
"poll_history_detail_view_in_timeline" = "View poll in timeline";
"poll_history_load_more" = "Load more polls";
"poll_history_fetching_error" = "Error fetching polls.";
// MARK: - Polls