]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 81a8d4f fe257a2)
Merge branch 'master' of github.com:annando/friendica
authorMichael <icarus@dabo.de>
Wed, 11 Apr 2012 16:47:21 +0000 (18:47 +0200)
committerMichael <icarus@dabo.de>
Wed, 11 Apr 2012 16:47:21 +0000 (18:47 +0200)

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