]> git.mxchange.org Git - friendica.git/commit
Merge remote branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Wed, 1 Aug 2012 22:21:14 +0000 (00:21 +0200)
committerMichael Vogel <icarus@dabo.de>
Wed, 1 Aug 2012 22:21:14 +0000 (00:21 +0200)
commit04c31d194f07e3b7a39ab7c8d5690da840c11fb7
tree41724ffba8f0f73dd1ebce64b2c435edc307e1f2
parentbed99674d27626ac1f4f9145cda770b5f4de2476
parentac88336ce9192fc271d07a2899d69c949a321a73
Merge remote branch 'upstream/master'

Conflicts:
update.php
database.sql
update.php