]> git.mxchange.org Git - friendica.git/commit
Merge commit 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Mon, 2 Apr 2012 20:00:22 +0000 (22:00 +0200)
committerMichael Vogel <icarus@dabo.de>
Mon, 2 Apr 2012 20:00:22 +0000 (22:00 +0200)
commit3dc317dcc62c8e982d964bcae421a1410771d51c
tree6e63f4e263a6637656ed24dfb5c36292d442c268
parenta39d8d3f02e5bbd711fde71594c2c787b21ef2e9
parent6dfd55668f39d2cfb27d468cc982471abaad5165
Merge commit 'upstream/master'
view/theme/diabook/style-network.css
view/theme/diabook/style-profile.css
view/theme/diabook/style-settings.css
view/theme/diabook/style.css