diff options
author | Michael Vogel <icarus@dabo.de> | 2012-05-09 14:56:48 +0200 |
---|---|---|
committer | Michael Vogel <icarus@dabo.de> | 2012-05-09 14:56:48 +0200 |
commit | f2e648d62fe7cafb9a55c7505687ea4d1c294778 (patch) | |
tree | 07a1b31339ccd871bb4fbfe73e3f0d4911689795 /view/settings.tpl | |
parent | a3f08c44be78d4517e9f1619811def09b2ec7e7a (diff) | |
parent | 53157bb954acb7597347c6b4a87e64e7a2f6cc79 (diff) | |
download | volse-hubzilla-f2e648d62fe7cafb9a55c7505687ea4d1c294778.tar.gz volse-hubzilla-f2e648d62fe7cafb9a55c7505687ea4d1c294778.tar.bz2 volse-hubzilla-f2e648d62fe7cafb9a55c7505687ea4d1c294778.zip |
Merge remote branch 'upstream/master'
Diffstat (limited to 'view/settings.tpl')
-rw-r--r-- | view/settings.tpl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/view/settings.tpl b/view/settings.tpl index 59c669a87..cec3c6f64 100644 --- a/view/settings.tpl +++ b/view/settings.tpl @@ -102,6 +102,7 @@ $unkmail <strong>$activity_options</strong> {{inc field_checkbox.tpl with $field=$post_newfriend }}{{endinc}} +{{inc field_checkbox.tpl with $field=$post_joingroup }}{{endinc}} {{inc field_checkbox.tpl with $field=$post_profilechange }}{{endinc}} |