]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 188829e a3f08c4)
Merge branch 'master' of github.com:annando/friendica
authorMichael <icarus@dabo.de>
Wed, 16 May 2012 06:10:28 +0000 (08:10 +0200)
committerMichael <icarus@dabo.de>
Wed, 16 May 2012 06:10:28 +0000 (08:10 +0200)

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