]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 20817b4 a3dcf49)
Merge remote branch 'upstream/master'
authorMichael <icarus@dabo.de>
Fri, 2 Mar 2012 16:44:09 +0000 (17:44 +0100)
committerMichael <icarus@dabo.de>
Fri, 2 Mar 2012 16:44:09 +0000 (17:44 +0100)

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