git.mxchange.org Git - quix0rs-gnu-social.git/commit

]> git.mxchange.org Git - quix0rs-gnu-social.git/commit - actions/allrss.php

author	Craig Andrews <candrews@integralblue.com>
	Mon, 8 Mar 2010 22:22:23 +0000 (17:22 -0500)
committer	Craig Andrews <candrews@integralblue.com>
	Mon, 8 Mar 2010 22:22:23 +0000 (17:22 -0500)
commit	714d920faea302b55857cc3bec4e9e6160ea136a
tree	cffa5ee7a3261ad24b272cb3ced16a6c1dcafad1	tree \| snapshot
parent	c187bf55974347f7ddb4f28714af57861dce8f08	commit \| diff
parent	51a245f18c1e4a830c5eb94f3e60c6b4b3e560ee	commit \| diff

Merge branch '0.9.x' into 1.0.x

Conflicts:
classes/statusnet.ini
db/statusnet.sql
lib/jabber.php
lib/xmppmanager.php

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