diff options
| author | Brion Vibber <brion@pobox.com> | 2010-03-17 12:15:12 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-03-17 12:15:12 -0700 |
| commit | ca5612c451e4dabde107ff2cfbc737a2f69136df (patch) | |
| tree | f404c43fa8583f026f8c9a472141a48be30d4e8e /plugins/OStatus/lib/discovery.php | |
| parent | 22f827134c3be845494bebd76bda9e4a074e710b (diff) | |
| parent | dacd0f3e6df020eda81d60139ac88437fed3352e (diff) | |
Merge branch 'master' into testing
Diffstat (limited to 'plugins/OStatus/lib/discovery.php')
0 files changed, 0 insertions, 0 deletions