]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'testing' into 0.9.x
authorEvan Prodromou <evan@status.net>
Sun, 31 Jan 2010 20:27:58 +0000 (15:27 -0500)
committerEvan Prodromou <evan@status.net>
Sun, 31 Jan 2010 20:27:58 +0000 (15:27 -0500)
commit779204b194447397d0770d96e291d9491fd731b9
treed0bfe36cc2b743fce8507e8cf6851467ccec8789
parentbd5278302574ae3af87f09e0d8191c95ab93582a
parent81087e45c5b797028e90181459e4c673cd7be278
Merge branch 'testing' into 0.9.x

Conflicts:
actions/apioauthauthorize.php
actions/apioauthauthorize.php
lib/api.php
lib/default.php
lib/util.php