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: e0cb6d6 e04a6ef)

author	Brion Vibber <brion@pobox.com>
	Mon, 18 Oct 2010 19:17:11 +0000 (12:17 -0700)
committer	Brion Vibber <brion@pobox.com>
	Mon, 18 Oct 2010 19:17:11 +0000 (12:17 -0700)
commit	7765ddae81e9b29af06009d961b3d56b293f527c
tree	0878a6c3341683966343af3ceaba682b3526c2de	tree \| snapshot
parent	e0cb6d6f7fdda97cb6ed262f79706392e315c055	commit \| diff
parent	e04a6ef93ef7706671ba14f5108690bfe12c1592	commit \| diff

Merge branch '0.9.x' into 1.0.x

Conflicts:
README
lib/default.php

README	diff1 \|	diff2 \|	blob \| history
actions/shownotice.php	diff1 \|	diff2 \|	blob \| history
actions/showstream.php	diff1 \|	diff2 \|	blob \| history
lib/default.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. :-)