diff options
| author | Evan Prodromou <evan@status.net> | 2010-02-21 09:19:27 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-02-21 09:19:27 -0500 |
| commit | 9898bbdeb29c02ee1864a41bd747ac3ec7505e54 (patch) | |
| tree | 5afab0e28ed677645d0727af4891960a21d27f12 /tests | |
| parent | 7f471bde231071e3512f203ceca4b830ac2204a1 (diff) | |
| parent | 5df61141d28426329d2f4e50e61c131d43d1e405 (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Conflicts:
plugins/OStatus/lib/activity.php
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions