]> git.mxchange.org Git - friendica.git/commit
Merge commit 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Sat, 7 Apr 2012 16:35:29 +0000 (18:35 +0200)
committerMichael Vogel <icarus@dabo.de>
Sat, 7 Apr 2012 16:35:29 +0000 (18:35 +0200)
commitcb05801a9031254f5882038de07a3ee4d5f89dd0
tree186d9d1a4c591ec23e0e5bbebd08301143b5c157
parent7308dbae282194356c2e95936aecc15ea059f356
parent0fa3b7f348c3deeb85cb5f5f9bd35ba47b0e92ee
Merge commit 'upstream/master'
htconfig.php
include/poller.php
view/theme/diabook/style-network.css
view/theme/diabook/style-profile.css
view/theme/diabook/style.css