]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '0.7.x' into 0.8.x
authorEvan Prodromou <evan@controlyourself.ca>
Thu, 12 Mar 2009 15:56:23 +0000 (11:56 -0400)
committerEvan Prodromou <evan@controlyourself.ca>
Thu, 12 Mar 2009 15:56:23 +0000 (11:56 -0400)
commitb3a0eea3b66e95becb6c4595ed71c7fe71ed6437
tree76666150701f03205bfff77e7d034dfa724f8764
parent399669b1fb955d2d8c18098a7b551184d534a94c
parente185c0395a6cd250ccd7c8e385c54830be73f937
Merge branch '0.7.x' into 0.8.x

Conflicts:

classes/Notice.php
lib/action.php
lib/router.php
lib/twitter.php
README
classes/Notice.php
classes/laconica.ini
db/laconica.sql
lib/action.php
lib/router.php
lib/twitter.php