https://reisub.nsupdate.info/git / friendica.git / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2abdfb4 e5875f2)
Merge branch 'fabrixxm-master'
authorFriendika <info@friendika.com>
Mon, 27 Dec 2010 21:06:20 +0000 (13:06 -0800)
committerFriendika <info@friendika.com>
Mon, 27 Dec 2010 21:06:20 +0000 (13:06 -0800)

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