]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c5c9908 47f369e)
Merge remote branch 'upstream/master'
authorzottel <github@zottel.net>
Tue, 6 Dec 2011 08:02:29 +0000 (00:02 -0800)
committerzottel <github@zottel.net>
Tue, 6 Dec 2011 08:02:29 +0000 (00:02 -0800)

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