Merge https://github.com/friendica/red into zpull

2013-04-03 18:06:16 -07:00
parent f353b9ae3d 0ba7f76bfd
commit 6e17be3e85
7 changed files with 42 additions and 43 deletions
--- a/include/features.php
+++ b/include/features.php
@@ -22,6 +22,7 @@ function get_features() {
 			array('expire',         t('Content Expiration'),		t('Remove old posts/comments after a period of time')),
 			array('multi_profiles', t('Multiple Profiles'),			t('Ability to create multiple profiles')),
 			array('webpages',       t('Web Pages'),                 t('Provide managed web pages on your channel')),
+			array('prettyphoto',       t('Enhanced Photo Albums'),                 t('Enable photo album with enhanced features')),
 			array('expert',       t('Expert Mode'),                 t('Enable Expert Mode to provide advanced configuration options')),