]> git.mxchange.org Git - friendica.git/commit
Merge remote branch 'upstream/master'
authorMichael <icarus@dabo.de>
Sun, 19 Feb 2012 19:09:42 +0000 (20:09 +0100)
committerMichael <icarus@dabo.de>
Sun, 19 Feb 2012 19:09:42 +0000 (20:09 +0100)
commitcafd4003522a472d2709569ea5eb5f80b817af23
treebbd512126515afc929de06dce79ba847b9681092
parent73e0e4d78341cb96ef9665a0ee4fb7e7ee2a701f
parenta9ed5915cebcf51347acaad51d0c252e57bceaff
Merge remote branch 'upstream/master'

Conflicts:
view/theme/vier/style.css
view/theme/vier/style.css