]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
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)
commit77936568b533904d78f3d4219dca9b8a6f85ed5f
tree76802640453085dff46150a2150658b05be6e89b
parent8ef341d5890d56d947bd2e01f3ef65adbceb8668
parent46e03373480bf051df10fb8c047a3fc4ca4abdee
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

* '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."