]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
authorZach Copley <zach@status.net>
Mon, 4 Apr 2011 21:33:55 +0000 (14:33 -0700)
committerZach Copley <zach@status.net>
Mon, 4 Apr 2011 21:33:55 +0000 (14:33 -0700)
* '1.0.x' of gitorious.org:statusnet/mainline:
  single flag for private groups
  add force_scope flag to User_group


Trivial merge