]> git.mxchange.org Git - friendica.git/commit
Merge commit 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Sun, 11 Mar 2012 19:22:28 +0000 (20:22 +0100)
committerMichael Vogel <icarus@dabo.de>
Sun, 11 Mar 2012 19:22:28 +0000 (20:22 +0100)
commitd653e27e2dfc172fd66a0987312952d736aca3e7
treee0725ca5cf27fc4400a7566eebc0721528d69fd4
parentebdf4842184cc8d0576abe99b29650c6b6512167
parent1dad15a021cc5d03f4238ab77ff051fc0ca1e35e
Merge commit 'upstream/master'

Conflicts:

view/theme/diabook/wall_item.tpl
view/theme/diabook/wallwall_item.tpl
view/theme/diabook/style.css
view/theme/diabook/wall_item.tpl
view/theme/diabook/wallwall_item.tpl