]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Thu, 4 Sep 2014 00:29:12 +0000 (02:29 +0200)
committerMichael Vogel <icarus@dabo.de>
Thu, 4 Sep 2014 00:29:12 +0000 (02:29 +0200)
commit24b3befc4d6754d57ae94abe4122b4977f14ff0f
treed76b72d598dc263bba4bcf662b96515cec44701f
parent56f0af20672266507dd16d5759698929b098d3e7
parentf17e6f534fd5a86eda77385e5aa0c4d638804b8e
Merge remote-tracking branch 'upstream/master'

Conflicts:
boot.php
update.php
boot.php
include/dbstructure.php
update.php