git.mxchange.org Git - quix0rs-gnu-social.git/commit

]> git.mxchange.org Git - quix0rs-gnu-social.git/commit

author	Evan Prodromou <evan@controlyourself.ca>
	Wed, 15 Apr 2009 14:25:26 +0000 (10:25 -0400)
committer	Evan Prodromou <evan@controlyourself.ca>
	Wed, 15 Apr 2009 14:25:26 +0000 (10:25 -0400)
commit	5ff8d8d447f306f4ad654d56b47cc6f740321c38
tree	113c2546f5fab3687f8101fb33a8a25b5880114d	tree \| snapshot
parent	8da76e0810342a90ac006f67cfd73500972f883a	commit \| diff
parent	8439477201cd59a6c0dba84ddf48eb86a6154199	commit \| diff

Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

Conflicts:
actions/public.php

12 files changed:

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