]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
authorZach Copley <zach@controlyourself.ca>
Fri, 3 Jul 2009 22:42:55 +0000 (15:42 -0700)
committerZach Copley <zach@controlyourself.ca>
Fri, 3 Jul 2009 22:42:55 +0000 (15:42 -0700)
* '0.8.x' of git@gitorious.org:laconica/dev:
  null for both args in conversation
  no limit on conversation stream
  fixed limit for conversations
  only show subscribe button in profile list for local users
  move peoplesearchresults class to action/peoplesearch
  only show subscription controls to owner


Trivial merge