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>
	Wed, 23 Sep 2009 13:45:22 +0000 (09:45 -0400)
committer	Evan Prodromou <evan@status.net>
	Wed, 23 Sep 2009 13:45:22 +0000 (09:45 -0400)
commit	8284b3cb82f4dec6e0f2bf74dea6e1a3bc7f4eac
tree	09b8c466df2476f9219550464eb73f6ecaa54e1c	tree \| snapshot
parent	2cabfba767ba0d92d34a6ea4e4cf91c7325f3e95	commit \| diff
parent	bef4a8b6ba9e19f2ec629031444279ca76f17bcf	commit \| diff

Merge branch '0.8.x' into 0.9.x

Conflicts:
actions/requesttoken.php
classes/File.php
install.php
lib/noticeform.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. :-)