From 22b6b0271e628be57a784d520953c5cdf197478f Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Wed, 18 Jan 2023 11:06:47 +0100 Subject: [PATCH] fix issue after resolving merge conflicts Signed-off-by: Arthur Schiwon --- CHANGELOG.md | 2 -- lib/Settings/Admin.php | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 65326d93a..bd8f94ad7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,8 +9,6 @@ All notable changes to this project will be documented in this file. ### Changed - drop support for Nextcloud 21 and 22 -- Use session locking to be compatible with Nextcloud 25 during logout - ## 5.1.2 ### Fixed diff --git a/lib/Settings/Admin.php b/lib/Settings/Admin.php index 848417151..3bab8fff1 100644 --- a/lib/Settings/Admin.php +++ b/lib/Settings/Admin.php @@ -143,8 +143,8 @@ public function getForm() { 'group_mapping_prefix' => [ 'text' => $this->l10n->t('Group Mapping Prefix, default: %s', [SAMLSettings::DEFAULT_GROUP_PREFIX]), 'type' => 'line', - required => true, - + 'required' => true, + ], ]; $userFilterSettings = [