]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master' of git://github.com/friendica/friendica
authorAlexander Kampmann <programmer@nurfuerspam.de>
Wed, 14 Mar 2012 11:57:35 +0000 (12:57 +0100)
committerAlexander Kampmann <programmer@nurfuerspam.de>
Wed, 14 Mar 2012 11:57:35 +0000 (12:57 +0100)
commit70709a882594250684c954a21d186877ea6f983c
treeee2f364e513f8fd9fa1e12da8f5cd39c36d9b403
parent509ed2604fe6860b83e02984f8b4a280496a22a8
parent42462cc1f00cd0d2e637ff3ddb62b30ae4a645c6
Merge branch 'master' of git://github.com/friendica/friendica

Conflicts:
view/de/strings.php
view/de/strings.php