]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 757e342 b30c761)
Merge branch 'master' of https://github.com/friendica/friendica
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Tue, 17 Apr 2012 16:07:20 +0000 (18:07 +0200)
committerTobias Diekershoff <tobias.diekershoff@gmx.net>
Tue, 17 Apr 2012 16:07:20 +0000 (18:07 +0200)
1  2 
view/de/strings.php patch | diff1 | diff2 | blob | history

diff --cc view/de/strings.php
Simple merge
Unnamed repository; edit this file 'description' to name the repository.