diff options
| author | Zach Copley <zach@status.net> | 2010-02-02 08:48:52 +0000 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2010-02-02 08:48:52 +0000 |
| commit | 2be00ce64221197f3c8ad1458eba2488c8836e5c (patch) | |
| tree | b3fd0ee62c631f53b2c8670ec1f109283b2d6b34 /scripts/xmppdaemon.php | |
| parent | 952b5806987e12a34e6fd75509b5d78815c1aa2d (diff) | |
| parent | 5e90f744a6fb58c43f8f5332ef868ba38e82b3d1 (diff) | |
Merge branch 'oauth-continued' into 0.9.x
Diffstat (limited to 'scripts/xmppdaemon.php')
0 files changed, 0 insertions, 0 deletions