]> git.mxchange.org Git - friendica.git/commit
Merge remote branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Sat, 23 Jun 2012 10:50:00 +0000 (12:50 +0200)
committerMichael Vogel <icarus@dabo.de>
Sat, 23 Jun 2012 10:50:00 +0000 (12:50 +0200)
commita81af2e042ae133bec3097488feeaa1318dc798b
tree25d2103fb3ce9edf45c0f7d1142b5cd3f63f8591
parent7a4ad4564dc4fa49aa860a10949ffe8958305f3a
parentbf47bf5ba015a844919362a56903eb82c064bee9
Merge remote branch 'upstream/master'

Conflicts:
include/bb2diaspora.php
include/bb2diaspora.php
include/diaspora.php