]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ccfe402 9d885c4)
Merge remote branch 'upstream/master'
authorMichael <icarus@dabo.de>
Sat, 3 Mar 2012 12:21:11 +0000 (13:21 +0100)
committerMichael <icarus@dabo.de>
Sat, 3 Mar 2012 12:21:11 +0000 (13:21 +0100)

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