summary refs log tree commit diff
path: root/src/UserSettingsPage.cpp
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2020-10-08 16:57:03 +0200
committerNicolas Werner <nicolas.werner@hotmail.de>2020-10-08 16:57:03 +0200
commit99ba1f17d3b7c7cb83c913c17c3f58eccfe3e1f6 (patch)
treeb337a2a83b3795518f6f82bbad85938fea40d916 /src/UserSettingsPage.cpp
parentImplement signature upload for own master key (diff)
parentMerge pull request #294 from trilene/master (diff)
downloadnheko-99ba1f17d3b7c7cb83c913c17c3f58eccfe3e1f6.tar.xz
Merge remote-tracking branch 'origin/master' into cross-signing
Diffstat (limited to 'src/UserSettingsPage.cpp')
-rw-r--r--src/UserSettingsPage.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/UserSettingsPage.cpp b/src/UserSettingsPage.cpp

index f1542ec5..7d81e663 100644 --- a/src/UserSettingsPage.cpp +++ b/src/UserSettingsPage.cpp
@@ -511,7 +511,6 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge callsLabel->setFixedHeight(callsLabel->minimumHeight() + LayoutTopMargin); callsLabel->setAlignment(Qt::AlignBottom); callsLabel->setFont(font); - useStunServer_ = new Toggle{this}; auto encryptionLabel_ = new QLabel{tr("ENCRYPTION"), this}; encryptionLabel_->setFixedHeight(encryptionLabel_->minimumHeight() + LayoutTopMargin);