diff options
| author | Paolo T <tuscanhobbit@users.noreply.github.com> | 2014-08-18 18:55:18 +0200 |
|---|---|---|
| committer | Paolo T <tuscanhobbit@users.noreply.github.com> | 2014-08-18 18:55:18 +0200 |
| commit | b5d1c7865b14fa60c35618b4179eb3c91949a441 (patch) | |
| tree | 38ddb2fcab0f4c2c3baf6917e3544148cbe1eb9e /view/tpl/settings.tpl | |
| parent | 3b979dd2a9f8bb8f569c234408d02dfd1e7039d7 (diff) | |
| parent | d9ff121930554aa9bcad4f4ceffeb9b5e3b83d17 (diff) | |
| download | volse-hubzilla-b5d1c7865b14fa60c35618b4179eb3c91949a441.tar.gz volse-hubzilla-b5d1c7865b14fa60c35618b4179eb3c91949a441.tar.bz2 volse-hubzilla-b5d1c7865b14fa60c35618b4179eb3c91949a441.zip | |
Merge pull request #1 from friendica/master
Red master has been merged
Diffstat (limited to 'view/tpl/settings.tpl')
| -rwxr-xr-x | view/tpl/settings.tpl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 89c05b75f..443e63696 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -93,9 +93,9 @@ <div id="settings-notifications"> <div id="settings-activity-desc">{{$activity_options}}</div> -{{*the next two aren't yet implemented *}} -{{*include file="field_checkbox.tpl" field=$post_newfriend*}} +{{*not yet implemented *}} {{*include file="field_checkbox.tpl" field=$post_joingroup*}} +{{include file="field_checkbox.tpl" field=$post_newfriend}} {{include file="field_checkbox.tpl" field=$post_profilechange}} |