]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: edc7e57 c3f70a9)
Merge remote branch 'upstream/master'
authorzottel <github@zottel.net>
Sat, 28 Apr 2012 00:30:20 +0000 (02:30 +0200)
committerzottel <github@zottel.net>
Sat, 28 Apr 2012 00:30:20 +0000 (02:30 +0200)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.