diff options
| author | Evan Prodromou <evan@status.net> | 2010-02-23 16:02:27 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-02-23 16:02:27 -0500 |
| commit | b09304a6c4553044983176fb2740206777868378 (patch) | |
| tree | 612381c27789be05070d4e7ca03d8f05fff58d5e /plugins/OStatus/lib/magicenvelope.php | |
| parent | a0c255e231a84cf77554cc3c0a095eae7b0ffd9c (diff) | |
| parent | 90d34b26c66ceb5d37a9c2782356b46361a523cc (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Conflicts:
plugins/OStatus/OStatusPlugin.php
Diffstat (limited to 'plugins/OStatus/lib/magicenvelope.php')
0 files changed, 0 insertions, 0 deletions