]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2517270 a2723f8)
Merge branch 'master' of git://github.com/tobiasd/friendika
authorroot <root@diekershoff.homeunix.net>
Fri, 21 Jan 2011 11:20:22 +0000 (12:20 +0100)
committerroot <root@diekershoff.homeunix.net>
Fri, 21 Jan 2011 11:20:22 +0000 (12:20 +0100)

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