]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 88bbc5e 576eb6c)
Merge remote branch 'upstream/master'
authorzottel <github@zottel.net>
Thu, 22 Mar 2012 08:16:10 +0000 (09:16 +0100)
committerzottel <github@zottel.net>
Thu, 22 Mar 2012 08:16:10 +0000 (09:16 +0100)

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