]> git.mxchange.org Git - friendica-addons.git/commit
Merge commit 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Sun, 1 Apr 2012 12:08:36 +0000 (14:08 +0200)
committerMichael Vogel <icarus@dabo.de>
Sun, 1 Apr 2012 12:08:36 +0000 (14:08 +0200)
commitced503973ade95bc6681c03503b8ac4fed9e87c3
tree99af657bf2d723bcfc11339d2b534b76fd174045
parent79f5e9d0837290658b0119eafd81c420c09150fc
parent4f24c19039207abfdee58ee9490d6c018dfd0b0a
Merge commit 'upstream/master'

Conflicts:

facebook/facebook.php
facebook/facebook.php