]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5fadf68 c35b9ec)
Merge remote branch 'upstream/master'
authorzottel <github@zottel.net>
Fri, 23 Mar 2012 12:29:02 +0000 (13:29 +0100)
committerzottel <github@zottel.net>
Fri, 23 Mar 2012 12:29:02 +0000 (13:29 +0100)

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