]> 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: 8ef341d 46e0337)
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
authorZach Copley <zach@status.net>
Tue, 5 Apr 2011 17:30:14 +0000 (10:30 -0700)
committerZach Copley <zach@status.net>
Tue, 5 Apr 2011 17:30:14 +0000 (10:30 -0700)
* '1.0.x' of gitorious.org:statusnet/mainline:
  fix constructor error in FileNoticeStream
  Style for best QnA answer.
  Revert "Paging fix for public timeline: drop replies from the stuff we pull in for the threaded web view."


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. :-)