]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b361bce afd2bf0)
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Fri, 6 Apr 2012 07:54:09 +0000 (03:54 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Fri, 6 Apr 2012 07:54:09 +0000 (03:54 -0400)
* remotes/upstream/master:
  update to the German strings
  add network_tabs hook
  pass autoname(0) test
  rev update
  added index to config and pconfig table changed config.php to use REPLACE instead of INSERT, this removes one db hit.

* master:


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.