]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 282465e a7fd3a8)
Merge remote branch 'upstream/master'
authorzottel <github@zottel.net>
Thu, 15 Mar 2012 09:18:06 +0000 (10:18 +0100)
committerzottel <github@zottel.net>
Thu, 15 Mar 2012 09:18:06 +0000 (10:18 +0100)

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