aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-09-28 13:08:04 +0200
committerMario Vavti <mario@mariovavti.com>2018-09-28 13:08:04 +0200
commitd9ccd24b028ec214950d615523504171d5dafbd8 (patch)
tree3ad3c857d6b9946d35ce3040b994ad3e500869ae
parentc6db644c4208397a863f06f45f91918d44a994f3 (diff)
parent27fef98a390b7dfb14c25c3ad7da456db670e607 (diff)
downloadvolse-hubzilla-d9ccd24b028ec214950d615523504171d5dafbd8.tar.gz
volse-hubzilla-d9ccd24b028ec214950d615523504171d5dafbd8.tar.bz2
volse-hubzilla-d9ccd24b028ec214950d615523504171d5dafbd8.zip
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
-rw-r--r--include/features.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/features.php b/include/features.php
index c07e30336..ccf3c5faf 100644
--- a/include/features.php
+++ b/include/features.php
@@ -288,7 +288,7 @@ function get_features($filtered = true, $level = (-1)) {
'nav_channel_select',
t('Navigation Channel Select'),
t('Change channels directly from within the navigation dropdown menu'),
- true,
+ false,
get_config('feature_lock','nav_channel_select'),
]