diff options
| author | James Walker <walkah@walkah.net> | 2010-02-25 23:49:45 -0500 |
|---|---|---|
| committer | James Walker <walkah@walkah.net> | 2010-02-25 23:49:45 -0500 |
| commit | 7c8031dc4bf6ece83db893e13d89ced10c2f6b62 (patch) | |
| tree | 9b48e3d511642450ac0566b00cfb6f2d8ae109aa /lib/queued_xmpp.php | |
| parent | 855692141d531287b179841b8816e90023b6ba7b (diff) | |
| parent | 02300ebfb08bfcd52f4ab34d1041455079ebf2ec (diff) | |
Merge remote branch 'statusnet/testing' into testing
Conflicts:
plugins/OStatus/lib/webfinger.php
Diffstat (limited to 'lib/queued_xmpp.php')
0 files changed, 0 insertions, 0 deletions