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

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

author	Evan Prodromou <evan@status.net>
	Sun, 4 Oct 2009 07:07:37 +0000 (03:07 -0400)
committer	Evan Prodromou <evan@status.net>
	Sun, 4 Oct 2009 07:07:37 +0000 (03:07 -0400)
commit	c5047fd90ac8f6f057780a34065e320883c7a31f
tree	01af92337e09496587020c49f7cafe0880ebdbbe	tree \| snapshot
parent	18f4a7eaea3c78cb55db843d77b43db86ac70308	commit \| diff
parent	d1a5a4987514bc786eb270f0cc30300f7328a963	commit \| diff

Merge branch '0.8.x' into 0.9.x

Conflicts:
classes/Profile.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. :-)