]> git.mxchange.org Git - friendica.git/commit
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)
commit43d5876e8b35d53a0bef5248c5d63e5bc209dbbf
tree2f9d83d87682b16ac6ac949382ab566fdca48076
parentb361bcea83140c28b5a5677905405de0ac102791
parentafd2bf031eff688ae53e51f9199d025ca1935abe
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* 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: