]> 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>
Wed, 24 Aug 2011 20:57:48 +0000 (13:57 -0700)
committerZach Copley <zach@status.net>
Wed, 24 Aug 2011 20:57:48 +0000 (13:57 -0700)
commit3b1c5e5ac11b2f1103ec72ec3eed049bd503b7fc
tree7bb0046bf18da8a0e15ef0f19d58becdeeda738b
parentf955cf6ace4e3c13b1c84c13a188ce53ac9c12a5
parenteef89c6712c84d1839943a1b7753e4317b2fc4c4
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

* '1.0.x' of gitorious.org:statusnet/mainline:
  Fix blog plugin error to allow deleting a blog post
  correctly show the blog content for blog entries