https://reisub.nsupdate.info/git / friendica.git / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 31d4471 e68f680)
Merge branch 'master' of git://github.com/friendika/friendika
authorroot <root@diekershoff.homeunix.net>
Sat, 1 Jan 2011 12:00:50 +0000 (13:00 +0100)
committerroot <root@diekershoff.homeunix.net>
Sat, 1 Jan 2011 12:00:50 +0000 (13:00 +0100)

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