]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9b93bd2 e591ed6)
Merge branch 'master' of git://github.com/friendika/friendika
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Fri, 3 Jun 2011 14:16:27 +0000 (16:16 +0200)
committerTobias Diekershoff <tobias.diekershoff@gmx.net>
Fri, 3 Jun 2011 14:16:27 +0000 (16:16 +0200)

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