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: 49a872b f3cea24)

author	Brion Vibber <brion@pobox.com>
	Wed, 3 Mar 2010 17:53:38 +0000 (09:53 -0800)
committer	Brion Vibber <brion@pobox.com>
	Wed, 3 Mar 2010 17:53:38 +0000 (09:53 -0800)
commit	7313cd909479f771e960466d9194783c9a3158bb
tree	318734efe06c9de904364f04cb76e1c54b75e269	tree \| snapshot
parent	49a872b56f82a3f1ba59f0751c11dfe7754393dd	commit \| diff
parent	f3cea2430497e751bc7776fe3abf0603e2b55f8b	commit \| diff

Merge branch 'testing' of git@gitorious.org:statusnet/mainline

Conflicts:
plugins/OStatus/OStatusPlugin.php

lib/activity.php

This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)