diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-05-04 02:31:21 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-05-04 02:31:21 -0400 |
| commit | 00190b7faab2baf21523a7243268057142f6de88 (patch) | |
| tree | 8c931e7a9feb65af4505864e605dbccf544bfdec /view/remote_friends_common.tpl | |
| parent | 22c8fe46a554457b43b9721f1f46739511398060 (diff) | |
| download | volse-hubzilla-00190b7faab2baf21523a7243268057142f6de88.tar.gz volse-hubzilla-00190b7faab2baf21523a7243268057142f6de88.tar.bz2 volse-hubzilla-00190b7faab2baf21523a7243268057142f6de88.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
DE strings
implement max load average before queuing/deferring delivery and poller processes
yet another bug in remote_friends_in_common
string update
use html symbols for double quotes
string update
proofreading the mail templates in fr fixed typo, grammar, spelling…
validate_url() and validate_email() validate also IP address.
* master:
Diffstat (limited to 'view/remote_friends_common.tpl')
0 files changed, 0 insertions, 0 deletions