]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1554510 ac7a138)
Merge branch 'inblob' of git@gitorious.org:~evan/statusnet/evans-mainline into inblob
authorEvan Prodromou <evan@status.net>
Sat, 9 Jan 2010 22:19:59 +0000 (14:19 -0800)
committerEvan Prodromou <evan@status.net>
Sat, 9 Jan 2010 22:19:59 +0000 (14:19 -0800)
Conflicts:
classes/Inbox.php
classes/Notice.php
classes/Notice_inbox.php


Trivial merge
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)