]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a118f83 e7ae4ad)
Merge branch 'master' of git://github.com/friendika/friendika
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Sat, 15 Jan 2011 07:55:19 +0000 (08:55 +0100)
committerTobias Diekershoff <tobias.diekershoff@gmx.net>
Sat, 15 Jan 2011 07:55:19 +0000 (08:55 +0100)

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