]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
authorZach Copley <zach@status.net>
Thu, 21 Oct 2010 00:28:28 +0000 (17:28 -0700)
committerZach Copley <zach@status.net>
Thu, 21 Oct 2010 00:28:28 +0000 (17:28 -0700)
commitbfdb8385ecc745002b8c45510caf2fdf7c2d2c9f
tree392196b097fafb10430bb7db763fd744a0639bf3
parente56385a7bb25336a72c1d37ad43d51ba8e238231
parent31f52ec37c5a2be76c197a9c492d3a236af045cd
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x

Conflicts:
actions/apioauthauthorize.php
lib/apioauthstore.php
actions/apioauthaccesstoken.php
actions/apioauthauthorize.php
lib/apioauthstore.php