diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-03-04 06:05:47 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-03-04 06:05:47 +0100 |
| commit | 059da4d01705ca1515e0ccf4b790c407c751685c (patch) | |
| tree | a7f77e3734ba1e53bf7980ff1b6f0c73bc814602 /include/features.php | |
| parent | 264abef81761a3ed0d27126dbc5a6e0a47fb8ec8 (diff) | |
| parent | a59d1b22f6ab1bf5b3cf5df555d71b893c05540a (diff) | |
| download | volse-hubzilla-059da4d01705ca1515e0ccf4b790c407c751685c.tar.gz volse-hubzilla-059da4d01705ca1515e0ccf4b790c407c751685c.tar.bz2 volse-hubzilla-059da4d01705ca1515e0ccf4b790c407c751685c.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 1ef070b00..ff6b71d4c 100644 --- a/include/features.php +++ b/include/features.php @@ -66,7 +66,7 @@ function get_features($filtered = true) { 'composition' => array( t('Post Composition Features'), // array('richtext', t('Richtext Editor'), t('Enable richtext editor'),falseget_config('feature_lock','richtext')), - array('markdown', t('Use Markdown'), t('Allow use of "Markdown" to format posts'),false,get_config('feature_lock','markdown')), +// array('markdown', t('Use Markdown'), t('Allow use of "Markdown" to format posts'),false,get_config('feature_lock','markdown')), array('large_photos', t('Large Photos'), t('Include large (1024px) photo thumbnails in posts. If not enabled, use small (640px) photo thumbnails'),false,get_config('feature_lock','large_photos')), array('channel_sources', t('Channel Sources'), t('Automatically import channel content from other channels or feeds'),false,get_config('feature_lock','channel_sources')), array('content_encrypt', t('Even More Encryption'), t('Allow optional encryption of content end-to-end with a shared secret key'),false,get_config('feature_lock','content_encrypt')), |