]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a2c4ce7 fd2f7dd)
Merge remote branch 'upstream/master'
authorzottel <github@zottel.net>
Mon, 16 Apr 2012 11:53:05 +0000 (13:53 +0200)
committerzottel <github@zottel.net>
Mon, 16 Apr 2012 11:53:05 +0000 (13:53 +0200)

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