]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3f3c4ae 622b25d)
Merge remote branch 'upstream/master'
authorzottel <github@zottel.net>
Thu, 22 Mar 2012 15:03:14 +0000 (16:03 +0100)
committerzottel <github@zottel.net>
Thu, 22 Mar 2012 15:03:14 +0000 (16:03 +0100)

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