From: Simon L'nu Date: Fri, 6 Apr 2012 07:54:09 +0000 (-0400) Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=43d5876e8b35d53a0bef5248c5d63e5bc209dbbf;p=friendica.git 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: --- 43d5876e8b35d53a0bef5248c5d63e5bc209dbbf