diff options
| author | Evan Prodromou <evan@status.net> | 2010-02-19 16:55:24 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-02-19 16:55:24 -0500 |
| commit | d69f6dff6a0b62ddab929f6ba0801533a9031162 (patch) | |
| tree | 2b49953ca2b5306a512f90e5d780cbe07d225b3c /plugins/PoweredByStatusNet | |
| parent | b0327506a491f029b239ae703e1acb1d42ae299c (diff) | |
| parent | a1a3ab1c58cf8636c4e9ac6b9d44bdc18946a547 (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Conflicts:
plugins/OStatus/actions/salmon.php
Diffstat (limited to 'plugins/PoweredByStatusNet')
0 files changed, 0 insertions, 0 deletions