aboutsummaryrefslogtreecommitdiffstats
path: root/include/features.php
diff options
context:
space:
mode:
authorThomas Willingham <founder@kakste.com>2013-10-01 22:58:44 +0100
committerThomas Willingham <founder@kakste.com>2013-10-01 22:58:44 +0100
commit70fd797994e4b861d20d99cec2a7d801e478d894 (patch)
tree5b00b61522f2c7136912396df54bd3251e3f17c8 /include/features.php
parent2c9c206808fec2212141f8630ce534ed29a47037 (diff)
parent27e97571d44f9e69a66eead9da2de4209996457d (diff)
downloadvolse-hubzilla-70fd797994e4b861d20d99cec2a7d801e478d894.tar.gz
volse-hubzilla-70fd797994e4b861d20d99cec2a7d801e478d894.tar.bz2
volse-hubzilla-70fd797994e4b861d20d99cec2a7d801e478d894.zip
Merge remote-tracking branch 'upstream/master'
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 6272b33ea..9950039c0 100644
--- a/include/features.php
+++ b/include/features.php
@@ -35,6 +35,7 @@ function get_features() {
t('Post Composition Features'),
array('richtext', t('Richtext Editor'), t('Enable richtext editor')),
array('preview', t('Post Preview'), t('Allow previewing posts and comments before publishing them')),
+ array('channel_sources', t('Channel Sources'), t('Automatically import channel content from other channels or feeds')),
),
// Network Tools