]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 90c8755 01637bc)
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)
commitca489631db840e33757a71a7e4cb56b187c182d3
tree92c71b81b6870a8fd2d9c94bed8571b653d95413tree | snapshot
parent90c87553ee7566593529199374215ae80bb3e209commit | diff
parent01637bcd32921d6857fb7f5c0bbd40fba6bdb830commit | diff
Merge branch '0.9.x' into 1.0.x

Conflicts:
actions/subscriptions.php
lib/router.php
lib/xmppmanager.php
lib/xmppoutqueuehandler.php
16 files changed:
EVENTS.txt diff1 | diff2 | blob | history
README diff1 | diff2 | blob | history
actions/apiaccountupdatedeliverydevice.php diff1 | diff2 | blob | history
actions/register.php diff1 | diff2 | blob | history
actions/showstream.php diff1 | diff2 | blob | history
actions/subscriptions.php diff1 | diff2 | blob | history
classes/Notice_tag.php diff1 | diff2 | blob | history
classes/Profile.php diff1 | diff2 | blob | history
classes/User.php diff1 | diff2 | blob | history
classes/statusnet.ini diff1 | diff2 | blob | history
db/statusnet.sql diff1 | diff2 | blob | history
lib/apiaction.php diff1 | diff2 | blob | history
lib/common.php diff1 | diff2 | blob | history
lib/router.php diff1 | diff2 | blob | history
lib/util.php diff1 | diff2 | blob | history
plugins/OpenID/OpenIDPlugin.php diff1 | diff2 | blob | history
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)