diff options
| author | zotlabs <mike@macgirvin.com> | 2018-01-17 18:27:45 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-01-17 18:27:45 -0800 |
| commit | 62e3083f23283d59c8e76c1bd8ccb2a07403551c (patch) | |
| tree | 937a6a1f488e618d239ac4d05f1141debd0141a9 /include/features.php | |
| parent | 05f9f0a393d7e414481f3e33e651d33f341e59b0 (diff) | |
| parent | 647a9b2740f8b51c99909c7c059cad315b4661ba (diff) | |
| download | volse-hubzilla-62e3083f23283d59c8e76c1bd8ccb2a07403551c.tar.gz volse-hubzilla-62e3083f23283d59c8e76c1bd8ccb2a07403551c.tar.bz2 volse-hubzilla-62e3083f23283d59c8e76c1bd8ccb2a07403551c.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
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'), |