diff options
| author | Zach Copley <zach@status.net> | 2010-02-24 16:52:16 -0800 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2010-02-24 16:52:16 -0800 |
| commit | 10884dcd49da8db1fcca3cbbef0f85869d43520e (patch) | |
| tree | 7c8376ed6cea7c971faacaa6e223a670d0e6481f /actions/apifriendshipsdestroy.php | |
| parent | 543ff40ef62f2587cde084b03bcf2e956f52ce2f (diff) | |
| parent | 5173d92895e892412e8a8c10b4e434c924593c99 (diff) | |
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
* 'testing' of gitorious.org:statusnet/mainline:
Merge StatusNet core localization updates from 0.9.x branch
Fix update_po_templates.php to support the plural and context variants of _m() in plugins
Drop HTMLPurifier; we don't need its extra capabilities and we're already using htmLawed which is lighter-weight.
OStatus: handle update-profile Salmon pings
Revert "Updated jQuery Form Plugin from v2.17 to v2.36"
OStatus: disable HTMLPurify cache unless we've configured a writable path for it.
Diffstat (limited to 'actions/apifriendshipsdestroy.php')
0 files changed, 0 insertions, 0 deletions