]> git.mxchange.org Git - friendica.git/commit
projects / friendica.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 22c8fe4) | patch
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Fri, 4 May 2012 06:31:21 +0000 (02:31 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Fri, 4 May 2012 06:31:21 +0000 (02:31 -0400)
commit00190b7faab2baf21523a7243268057142f6de88
tree8c931e7a9feb65af4505864e605dbccf544bfdectree | snapshot
parent22c8fe46a554457b43b9721f1f46739511398060commit | diff
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:
Unnamed repository; edit this file 'description' to name the repository.