diff options
| author | Max Kostikov <max@kostikov.co> | 2020-09-17 19:47:44 +0200 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2020-09-17 19:47:44 +0200 |
| commit | 02cf85fa344b028ba2275ed44909ad9eefe7be92 (patch) | |
| tree | 0732ac67cc4c44625278179fa54b62c20326dfe4 /include/features.php | |
| parent | 5271232aa5428f171ba1dedc42165a6a1611334e (diff) | |
| parent | 76a6e0b6fcda9ab87a8f6ec3ee8873d4fcdb4cd4 (diff) | |
| download | volse-hubzilla-02cf85fa344b028ba2275ed44909ad9eefe7be92.tar.gz volse-hubzilla-02cf85fa344b028ba2275ed44909ad9eefe7be92.tar.bz2 volse-hubzilla-02cf85fa344b028ba2275ed44909ad9eefe7be92.zip | |
Merge branch 'dev' into 'dev'
Dev sync
See merge request kostikov/core!1
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 0dd245e7f..e1457604b 100644 --- a/include/features.php +++ b/include/features.php @@ -144,7 +144,7 @@ function get_features($filtered = true, $level = (-1)) { 'conversation' => [ t('Conversation'), - + /* disable until we agree on how to implemnt this in zot6/activitypub [ 'commtag', t('Community Tagging'), @@ -152,7 +152,7 @@ function get_features($filtered = true, $level = (-1)) { false, get_config('feature_lock','commtag'), ], - + */ [ 'emojis', t('Emoji Reactions'), |