]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0116426 a1f94ac)
Merge remote branch 'upstream/master'
authorzottel <github@zottel.net>
Fri, 27 Apr 2012 06:10:04 +0000 (08:10 +0200)
committerzottel <github@zottel.net>
Fri, 27 Apr 2012 06:10:04 +0000 (08:10 +0200)

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