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: 714d920 eb56393)

author	Brion Vibber <brion@pobox.com>
	Mon, 22 Mar 2010 20:56:16 +0000 (13:56 -0700)
committer	Brion Vibber <brion@pobox.com>
	Mon, 22 Mar 2010 20:56:16 +0000 (13:56 -0700)
commit	e89908f26140c217e01b2f8f755712f38f3935f3
tree	6b241fc2e33f3528cf48b415ef67906826b02e24	tree \| snapshot
parent	714d920faea302b55857cc3bec4e9e6160ea136a	commit \| diff
parent	eb563937df921e5fc67ca0c87e229feb2907fd19	commit \| diff

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

Conflicts:
lib/channel.php
scripts/imdaemon.php

actions/shownotice.php	diff1 \|	diff2 \|	blob \| history
classes/User.php	diff1 \|	diff2 \|	blob \| history
lib/channel.php	diff1 \|	diff2 \|	blob \| history
lib/command.php	diff1 \|	diff2 \|	blob \| history
lib/queuemanager.php	diff1 \|	diff2 \|	blob \| history
lib/statusnet.php	diff1 \|	diff2 \|	blob \| history
lib/util.php	diff1 \|	diff2 \|	blob \| history
scripts/imdaemon.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. :-)