diff options
| author | Brion Vibber <brion@pobox.com> | 2010-03-22 13:56:16 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-03-22 13:56:16 -0700 |
| commit | e89908f26140c217e01b2f8f755712f38f3935f3 (patch) | |
| tree | 6b241fc2e33f3528cf48b415ef67906826b02e24 /plugins/OStatus/lib/hubconfqueuehandler.php | |
| parent | 714d920faea302b55857cc3bec4e9e6160ea136a (diff) | |
| parent | eb563937df921e5fc67ca0c87e229feb2907fd19 (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
lib/channel.php
scripts/imdaemon.php
Diffstat (limited to 'plugins/OStatus/lib/hubconfqueuehandler.php')
0 files changed, 0 insertions, 0 deletions