]> 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>
Sun, 28 Aug 2011 01:47:19 +0000 (18:47 -0700)
committerZach Copley <zach@status.net>
Sun, 28 Aug 2011 01:47:19 +0000 (18:47 -0700)
commit500ec79e391163f15a6a886968141ac37e89c52c
tree4a595471c2d4393a5f0f3e8cc03e7581f2424cf8
parenteaaa978d20fe304543d0da929c5f10b35c45d992
parent00be58829cc25928d8138f6ef506e4550af4aace
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

* '1.0.x' of gitorious.org:statusnet/mainline:
  add conversation ID to notice output
  For fave count, don't use distinct
  Static -> static
  allow posting to groups through atompub