diff options
author | Simon L'nu <simon.lnu@gmail.com> | 2012-06-03 18:03:20 -0400 |
---|---|---|
committer | Simon L'nu <simon.lnu@gmail.com> | 2012-06-03 18:03:20 -0400 |
commit | 8d4c77fc43e4d37e807248f13afb5b2913b6cfc4 (patch) | |
tree | 688f64270521b0c47eaacae020e2ba92274fddeb /view/settings.tpl | |
parent | 598a2563e844477de2f688663c7c46962b26b602 (diff) | |
parent | 9f4b89726176f9596cf3330a68cfab8cab5ab361 (diff) | |
download | volse-hubzilla-8d4c77fc43e4d37e807248f13afb5b2913b6cfc4.tar.gz volse-hubzilla-8d4c77fc43e4d37e807248f13afb5b2913b6cfc4.tar.bz2 volse-hubzilla-8d4c77fc43e4d37e807248f13afb5b2913b6cfc4.zip |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
rev update
database updates
Debugged implementation of Diaspora relayable_retractions
cleanup and logging
first shot at getting like/unlike functions to work consistently
Fix bugs in the retraction code
prepare to implement database update
Implement relaying of relayable_retractions
Support relayable_retractions that are relayed to us by the top-level post owner
quattro: admin panel styling and 1st buttons for addon/theme overview
privacy settings: make submit button translateable
DE: update to the strings
prv messages: make submit translateable
* master:
Diffstat (limited to 'view/settings.tpl')
-rw-r--r-- | view/settings.tpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/view/settings.tpl b/view/settings.tpl index d7ef21210..99ee9b51e 100644 --- a/view/settings.tpl +++ b/view/settings.tpl @@ -98,7 +98,7 @@ $group_select <div class="settings-submit-wrapper" > -<input type="submit" name="submit" class="settings-submit" value="Submit" /> +<input type="submit" name="submit" class="settings-submit" value="$submit" /> </div> |