]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2b6498b 6ca9f0e)
Merge remote-tracking branch 'upstream/master'
authorMichael <ike@pirati.ca>
Sun, 4 Nov 2012 08:59:58 +0000 (09:59 +0100)
committerMichael <ike@pirati.ca>
Sun, 4 Nov 2012 08:59:58 +0000 (09:59 +0100)

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