aboutsummaryrefslogtreecommitdiffstats
path: root/include/features.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-06-06 14:14:40 +0200
committerMario Vavti <mario@mariovavti.com>2016-06-06 14:14:40 +0200
commit655290b022f0443a121790ef7f0c1d4ddeecb289 (patch)
tree603e88df90c10ba5cc87d5bea90cb530459b70d0 /include/features.php
parent25aded6b9b137a32d9f9ea68baf3e2102fb293e7 (diff)
parentcfbd2fc85c6e428f87c5e8d529c98e3e89202f2a (diff)
downloadvolse-hubzilla-655290b022f0443a121790ef7f0c1d4ddeecb289.tar.gz
volse-hubzilla-655290b022f0443a121790ef7f0c1d4ddeecb289.tar.bz2
volse-hubzilla-655290b022f0443a121790ef7f0c1d4ddeecb289.zip
Merge branch 'sabre32' of https://github.com/redmatrix/hubzilla into sabre32
Diffstat (limited to 'include/features.php')
-rw-r--r--include/features.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/features.php b/include/features.php
index 38700f9f5..6d38bcfb4 100644
--- a/include/features.php
+++ b/include/features.php
@@ -94,6 +94,7 @@ function get_features($filtered = true) {
t('Post/Comment Tools'),
array('commtag', t('Community Tagging'), t('Ability to tag existing posts'),false,get_config('feature_lock','commtag')),
array('categories', t('Post Categories'), t('Add categories to your posts'),false,get_config('feature_lock','categories')),
+ array('emojis', t('Emoji Reactions'), t('Add emoji reaction ability to posts'),true,get_config('feature_lock','emojis')),
array('filing', t('Saved Folders'), t('Ability to file posts under folders'),false,get_config('feature_lock','filing')),
array('dislike', t('Dislike Posts'), t('Ability to dislike posts/comments'),false,get_config('feature_lock','dislike')),
array('star_posts', t('Star Posts'), t('Ability to mark special posts with a star indicator'),false,get_config('feature_lock','star_posts')),