diff options
author | root <root@v22013111044215586.yourvserver.net> | 2014-06-29 18:30:59 +0200 |
---|---|---|
committer | root <root@v22013111044215586.yourvserver.net> | 2014-06-29 18:30:59 +0200 |
commit | 5df50c4a0bf80f3697c7088c9c4a3815206fe97d (patch) | |
tree | ad3f2b4df700dae971683265c9a83d5bbee0eb31 /include/features.php | |
parent | 79dc4b83701f73bdece2b4d78a73698fbbc538c6 (diff) | |
parent | 628f1218049715c8acf953dbda8f902b3902cc2f (diff) | |
download | volse-hubzilla-5df50c4a0bf80f3697c7088c9c4a3815206fe97d.tar.gz volse-hubzilla-5df50c4a0bf80f3697c7088c9c4a3815206fe97d.tar.bz2 volse-hubzilla-5df50c4a0bf80f3697c7088c9c4a3815206fe97d.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/features.php')
-rw-r--r-- | include/features.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/features.php b/include/features.php index cc8d457bc..ef5923a01 100644 --- a/include/features.php +++ b/include/features.php @@ -38,7 +38,7 @@ function get_features() { // Post composition 'composition' => array( t('Post Composition Features'), - array('richtext', t('Richtext Editor'), t('Enable richtext editor')), +// 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')), array('content_encrypt', t('Even More Encryption'), t('Allow optional encryption of content end-to-end with a shared secret key')), |