]> 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 22:09:29 +0000 (15:09 -0700)
committerZach Copley <zach@status.net>
Mon, 4 Apr 2011 22:09:29 +0000 (15:09 -0700)
commit9d18b57812ae660f40daef892c5a0841881d7d06
treefb5a591d1f01493a706988270fc6a7f73705d702
parent9a371658bd227309d88eb542b45dae9af5475aba
parentddbd4801e067a4ec023f93a89bf28139b3c43f78
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

* '1.0.x' of gitorious.org:statusnet/mainline:
  include protected flag for users in JSON or XML
  Force group scope on notices sent to a private-only group