]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2b8c4df 9a94078)
Merge branch 'master' of github.com:annando/friendica
authorMichael <icarus@dabo.de>
Sat, 19 May 2012 14:55:33 +0000 (16:55 +0200)
committerMichael <icarus@dabo.de>
Sat, 19 May 2012 14:55:33 +0000 (16:55 +0200)

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