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: d4f6235 81b6b58)

author	Brion Vibber <brion@pobox.com>
	Tue, 16 Feb 2010 17:25:09 +0000 (09:25 -0800)
committer	Brion Vibber <brion@pobox.com>
	Tue, 16 Feb 2010 17:25:09 +0000 (09:25 -0800)
commit	d5cbfe8071d56438cfa168dc3db56a959317eae0
tree	c00ca6c3e0d1bd2fb9b05a515c337b6afce3a070	tree \| snapshot
parent	d4f6235d7b8a40bd1b51370e7eb405cdb14e61fb	commit \| diff
parent	81b6b58e33f55054b7e5dd546f06dbdb5696ed92	commit \| diff

Merge branch 'testing' into 0.9.x

Conflicts:
lib/iomaster.php

classes/File.php	diff1 \|	diff2 \|	blob \| history
lib/api.php	diff1 \|	diff2 \|	blob \| history
lib/default.php	diff1 \|	diff2 \|	blob \| history
lib/iomaster.php	diff1 \|	diff2 \|	blob \| history
lib/queuemanager.php	diff1 \|	diff2 \|	blob \| history
lib/util.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. :-)