]> git.mxchange.org Git - friendica.git/commit
Merge commit 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Thu, 15 Mar 2012 20:11:58 +0000 (21:11 +0100)
committerMichael Vogel <icarus@dabo.de>
Thu, 15 Mar 2012 20:11:58 +0000 (21:11 +0100)
commit9243c9fc141237453f05d215058d4b975d010437
tree0c63dd28deeb2157ee2683e787f00a4e8b5eaa7b
parent6e7a190e9197bcf4d00accc5d85ccca4a080bec8
parentab89aa90caced4f60fc0ae944c7190e156a872e2
Merge commit 'upstream/master'
include/text.php
view/theme/diabook/style.css