diff options
| author | Zach Copley <zach@status.net> | 2010-10-20 17:28:28 -0700 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2010-10-20 17:28:28 -0700 |
| commit | bfdb8385ecc745002b8c45510caf2fdf7c2d2c9f (patch) | |
| tree | 392196b097fafb10430bb7db763fd744a0639bf3 /lib/xmppoutqueuehandler.php | |
| parent | e56385a7bb25336a72c1d37ad43d51ba8e238231 (diff) | |
| parent | 31f52ec37c5a2be76c197a9c492d3a236af045cd (diff) | |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
actions/apioauthauthorize.php
lib/apioauthstore.php
Diffstat (limited to 'lib/xmppoutqueuehandler.php')
0 files changed, 0 insertions, 0 deletions