]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f955cf6 eef89c6)
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)
* '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


Trivial merge
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)