https://reisub.nsupdate.info/git / friendica.git / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4d3c694 9b9bd35)
Merge branch 'master' of git://github.com/friendika/friendika
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Tue, 14 Jun 2011 06:10:38 +0000 (08:10 +0200)
committerTobias Diekershoff <tobias.diekershoff@gmx.net>
Tue, 14 Jun 2011 06:10:38 +0000 (08:10 +0200)

Trivial merge
mirror https://github.com/friendica/friendica.git