diff options
| author | Zach Copley <zach@status.net> | 2010-03-19 10:08:47 -0700 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2010-03-19 10:08:47 -0700 |
| commit | fb50a2d83c9a530479874d51f203ad8b3d4c9a7a (patch) | |
| tree | 5322601414dcb9c3b7a39516bb81bb1d7063c980 /actions/block.php | |
| parent | 1f160bb7bc62d8672a4e600ab73fdddffd188194 (diff) | |
| parent | 05e3768e6a833d99a5180d4306d68f59e2d8f8c9 (diff) | |
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
* 'testing' of gitorious.org:statusnet/mainline:
Parse RSS items as activities
Remove hkit and do our own hcard parsing
Work around weird bug with HTML normalization via PHP DOM module; if source had xmlns and xml:lang I ended up with double output, breaking the subsequent parsing. Will have to track this down later and report upstream if not already resolved.
Diffstat (limited to 'actions/block.php')
0 files changed, 0 insertions, 0 deletions