]> 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>
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)
commite7124528a37081e48da6b3ac118b72981c6c48b0
tree105181462fd6f02f465d9da2e0deafaa0c263b29
parent5193afb8bf304071f4af79f165bc27c66ee33d7e
parentb41c62a27c6ef8039fb0853a6cf0663de77b1e05
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

* '1.0.x' of gitorious.org:statusnet/mainline:
  single flag for private groups
  add force_scope flag to User_group