diff options
| author | Evan Prodromou <evan@status.net> | 2010-03-18 20:57:38 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-03-18 20:57:38 -0500 |
| commit | ac609e804078cf70fcc02b36aa1eb40115354715 (patch) | |
| tree | c206723a0fe28fd62f8d2838f589a42ec7523af5 /actions/apisubscriptions.php | |
| parent | 17c50f338ceb574780476f6b788f48e2d7d06017 (diff) | |
| parent | 4a6c9e445149e42a4f81d5140296e7770c60bc6c (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Conflicts:
plugins/OStatus/extlib/hkit/hkit.class.php
plugins/OStatus/lib/discoveryhints.php
Diffstat (limited to 'actions/apisubscriptions.php')
0 files changed, 0 insertions, 0 deletions