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

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

author	Evan Prodromou <evan@controlyourself.ca>
	Thu, 15 Jan 2009 20:54:03 +0000 (20:54 +0000)
committer	Evan Prodromou <evan@controlyourself.ca>
	Thu, 15 Jan 2009 20:54:03 +0000 (20:54 +0000)
commit	7233e89be621c2b9ad80b8a7eb2bc16185596cca
tree	0adedc8accd9f90ea26fd008d3c4f4cf371ef839	tree \| snapshot
parent	c42b88308683fccfc7710a39a363d98270ade39b	commit \| diff
parent	c08eadc774c2231e6b434ba067e2d7115404606f	commit \| diff

Merge ../csarven into uiredesign

Conflicts:

lib/action.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. :-)