]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 030f6f3 c574e4c)
Merge branch 'master' of git://github.com/friendika/friendika
authorroot <root@diekershoff.homeunix.net>
Fri, 21 Jan 2011 06:08:02 +0000 (07:08 +0100)
committerroot <root@diekershoff.homeunix.net>
Fri, 21 Jan 2011 06:08:02 +0000 (07:08 +0100)

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