diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-01-16 08:55:42 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-01-16 08:55:42 +0100 |
| commit | 9aadcb0bd40a8f773dc164f7dadc8c238fff9954 (patch) | |
| tree | bd15059a020152b5dc59c265e22a27251efe0de4 /include/features.php | |
| parent | 746ea5a3691a67ceb176352e8b6fcfe0f2dc99d6 (diff) | |
| parent | 03f692f24fe543c740e5443223d8084b9ca0c4de (diff) | |
| download | volse-hubzilla-9aadcb0bd40a8f773dc164f7dadc8c238fff9954.tar.gz volse-hubzilla-9aadcb0bd40a8f773dc164f7dadc8c238fff9954.tar.bz2 volse-hubzilla-9aadcb0bd40a8f773dc164f7dadc8c238fff9954.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include/features.php')
| -rw-r--r-- | include/features.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/features.php b/include/features.php index 69eeed3e8..36eb74a9d 100644 --- a/include/features.php +++ b/include/features.php @@ -126,7 +126,7 @@ function get_features($filtered = true) { feature_level('cards',1), ], -/* reserved, work in progress + [ 'articles', t('Articles'), @@ -135,7 +135,7 @@ function get_features($filtered = true) { get_config('feature_lock','articles'), feature_level('articles',1), ], -*/ + [ 'nav_channel_select', t('Navigation Channel Select'), |