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

Merge branch 'develop' into riot_3293

Browse Source 
# Conflicts:
#	CHANGES.rst
#	Riot/Generated/Strings.swift
This commit is contained in:
SBiOSoftWhare
2020-06-26 14:30:21 +02:00
parent dfb5627126 74a0f7adee
commit b1908231f7
11 changed files with 732 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Assets/en.lproj/Vector.strings
+2
View File
@@ -605,6 +605,8 @@
"manage_session_not_trusted" = "Not trusted";
"manage_session_sign_out" = "Sign out of this session";
// AuthenticatedSessionViewControllerFactory
"authenticated_session_flow_not_supported" = "This app does not support the authentication mechanism on your homeserver.";
// Identity server settings
"identity_server_settings_title" = "Identity Server";