]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3aa516c d1345e5)
Merge remote branch 'upstream/master'
authorzottel <github@zottel.net>
Fri, 25 May 2012 19:05:42 +0000 (21:05 +0200)
committerzottel <github@zottel.net>
Fri, 25 May 2012 19:05:42 +0000 (21:05 +0200)

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