]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
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)
commit2881b553fec5167c8252f7c55247345e1af11be5
tree60e215fb1e5eaa4e566f7b197f6ae10ffc3e4345
parentc02acd7341cc3104b75a56e0b8dfd4811e77e278
parent088fa6befcf93607020fa2c77fcfdc952239efb8
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x

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