]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: ca48963)
Merge branch '0.9.x' into 1.0.x
authorBrion Vibber <brion@pobox.com>
Mon, 25 Oct 2010 20:08:57 +0000 (13:08 -0700)
committerBrion Vibber <brion@pobox.com>
Mon, 25 Oct 2010 20:08:57 +0000 (13:08 -0700)
Conflicts:
actions/subscriptions.php
lib/router.php
lib/xmppmanager.php
lib/xmppoutqueuehandler.php


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