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

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

author	Craig Andrews <candrews@integralblue.com>
	Wed, 2 Sep 2009 20:42:15 +0000 (16:42 -0400)
committer	Craig Andrews <candrews@integralblue.com>
	Wed, 2 Sep 2009 20:42:15 +0000 (16:42 -0400)
commit	a535ccdc4eba320ad88dc531329ae63c7f09c258
tree	a8448dfe0b764818562ca9d04a39f04d4978dead	tree \| snapshot
parent	f949c2c9d9afa63496f26b33d0309f8d06f77520	commit \| diff
parent	0c95734a6874608ea5ed44608cabeda7c3a1b4ea	commit \| diff

Merge remote branch 'laconica/0.8.x' into 0.9.x

Conflicts:
lib/common.php
lib/twitter.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. :-)