]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2871fd4 6ca9f0e)
Merge remote branch 'upstream/master'
authorzottel <github@zottel.net>
Sun, 4 Nov 2012 10:05:40 +0000 (11:05 +0100)
committerzottel <github@zottel.net>
Sun, 4 Nov 2012 10:05:40 +0000 (11:05 +0100)

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