diff options
author | Habeas Codice <habeascodice@federated.social> | 2014-11-19 21:11:11 -0800 |
---|---|---|
committer | Habeas Codice <habeascodice@federated.social> | 2014-11-19 21:11:11 -0800 |
commit | c8af19c69c03b39d5eded833a2d9d8ed9ab5826c (patch) | |
tree | 16ded6330f1baa9d8e889978c9e093f1e90d7d85 /include/features.php | |
parent | 92d0a9404ff92da23b558f9a73a3150f97b6a08e (diff) | |
parent | 18cae8a78cb3df8ffcd9e4787c3b572c799036da (diff) | |
download | volse-hubzilla-c8af19c69c03b39d5eded833a2d9d8ed9ab5826c.tar.gz volse-hubzilla-c8af19c69c03b39d5eded833a2d9d8ed9ab5826c.tar.bz2 volse-hubzilla-c8af19c69c03b39d5eded833a2d9d8ed9ab5826c.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/features.php')
-rw-r--r-- | include/features.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/features.php b/include/features.php index 7530158ec..92d8598a5 100644 --- a/include/features.php +++ b/include/features.php @@ -48,6 +48,7 @@ function get_features() { 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')), + array('adult_photo_flagging', t('Flag Adult Photos'), t('Provide photo edit option to hide adult photos from default album view')), ), // Network Tools |