]> 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: 55a080e cdd43d8)
Merge branch 'restricted-disqus' into 0.9.x
authorZach Copley <zach@status.net>
Thu, 30 Sep 2010 23:53:44 +0000 (16:53 -0700)
committerZach Copley <zach@status.net>
Thu, 30 Sep 2010 23:53:44 +0000 (16:53 -0700)

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. :-)