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

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

projects / quix0rs-gnu-social.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ddc7811 e05415f)

author	Brion Vibber <brion@pobox.com>
	Thu, 6 May 2010 00:11:23 +0000 (17:11 -0700)
committer	Brion Vibber <brion@pobox.com>
	Thu, 6 May 2010 00:11:23 +0000 (17:11 -0700)
commit	173778eab145cfd73f597cd75db195e4d47fe323
tree	78034559817d04f7fd6531f270e857b3bd55bf72	tree \| snapshot
parent	ddc7811a7b412c9c3c4b6bfb9350dd18a62fdf51	commit \| diff
parent	e05415f621890bbaf42752577249ecdc22c161fc	commit \| diff

Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x

Conflicts:
lib/xmppmanager.php (resolved: code has moved to XmppPlugin.php)

README	diff1 \|	diff2 \|	blob \| history
classes/User.php	diff1 \|	diff2 \|	blob \| history
lib/default.php	diff1 \|	diff2 \|	blob \| history
plugins/Xmpp/XmppPlugin.php	diff1 \|	\|	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. :-)