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: 62712b7 f3ffc8b)

author	Brion Vibber <brion@pobox.com>
	Tue, 1 Mar 2011 00:18:38 +0000 (16:18 -0800)
committer	Brion Vibber <brion@pobox.com>
	Tue, 1 Mar 2011 00:18:38 +0000 (16:18 -0800)
commit	59a0b2a82da418f688faf182407146d9e7a7af7a
tree	0d5b1ae6e0c691a10bcc670c74fc9d1ca2af2e4d	tree \| snapshot
parent	62712b794abd15d979f57935709d63ea9e65108a	commit \| diff
parent	f3ffc8bc46ebe5f2329bdf54fa28d4832c3a02f9	commit \| diff

Merge branch '1.0.x' of gitorious.org:statusnet/mainline into inline-comments

Conflicts:
js/util.min.js

js/util.js	diff1 \|	diff2 \|	blob \| history
js/util.min.js	diff1 \|	diff2 \|	blob \| history
lib/action.php	diff1 \|	diff2 \|	blob \| history
theme/base/css/display.css	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. :-)