From: Zach Copley Date: Tue, 5 Apr 2011 17:30:14 +0000 (-0700) Subject: Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=77936568b533904d78f3d4219dca9b8a6f85ed5f;p=quix0rs-gnu-social.git 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." --- 77936568b533904d78f3d4219dca9b8a6f85ed5f