git.mxchange.org Git - quix0rs-gnu-social.git/commit - classes/Local_group.php

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

projects / quix0rs-gnu-social.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: fadeafb 0faa988)

author	Zach Copley <zach@status.net>
	Thu, 29 Jul 2010 20:44:11 +0000 (20:44 +0000)
committer	Zach Copley <zach@status.net>
	Thu, 29 Jul 2010 20:44:11 +0000 (20:44 +0000)
commit	fb2e00eacc7090df0d05311e39f08cb72164a78c
tree	7a3d33d537d9c2bcd5f2c8c58ed38790e1e7c248	tree \| snapshot
parent	fadeafbccc804063240c4f799a29e3ffa04b73e7	commit \| diff
parent	0faa988e91056564b2ae19f045a81b322cce4e0c	commit \| diff

Merge branch 'master' into 0.9.x

Conflicts:
classes/Notice.php

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