Merge branch 'release/v2.0.0' into develop

# Conflicts:
#	Config/BWIBuildSettings.swift
This commit is contained in:
Frank Rotermund
2022-11-27 14:37:48 +01:00
21 changed files with 161 additions and 40 deletions
@@ -4959,7 +4959,7 @@ ChangePasswordCoordinatorBridgePresenterDelegate>
if (RiotSettings.shared.settingsScreenShowSimpleTimeLineOptions) {
[timelineSection addRowWithTag:TIMELINE_SIMPLE_INDEX];
} else {
if (BWIBuildSettings.shared.bwiShowMessageBubbles)
if (BWIBuildSettings.shared.bwiShowMessageBubbleSettings)
{
[timelineSection addRowWithTag:USER_INTERFACE_TIMELINE_STYLE_INDEX];
}