]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge remote branch 'laconica/0.8.x' into 0.9.x
authorCraig Andrews <candrews@integralblue.com>
Wed, 2 Sep 2009 20:42:15 +0000 (16:42 -0400)
committerCraig Andrews <candrews@integralblue.com>
Wed, 2 Sep 2009 20:42:15 +0000 (16:42 -0400)
commita535ccdc4eba320ad88dc531329ae63c7f09c258
treea8448dfe0b764818562ca9d04a39f04d4978dead
parentf949c2c9d9afa63496f26b33d0309f8d06f77520
parent0c95734a6874608ea5ed44608cabeda7c3a1b4ea
Merge remote branch 'laconica/0.8.x' into 0.9.x

Conflicts:
lib/common.php
lib/twitter.php
README
classes/File.php
classes/Notice.php
install.php
lib/command.php
lib/twitter.php
lib/twitterapi.php
lib/twitteroauthclient.php
lib/util.php