diff options
| author | Brion Vibber <brion@pobox.com> | 2010-03-25 14:15:54 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-03-25 14:15:54 -0700 |
| commit | c11064a5398db824f2623c5763b3fdfdf8ae3c39 (patch) | |
| tree | 86663a25bea567c4e0962cb3e63a79f7f82af891 /Makefile | |
| parent | 7fc8b6af4ae9a784b797d4f7aef49c820bb10bdf (diff) | |
Updated 'more' anchor for attachments to do an XHR GET
Conflicts:
lib/attachmentlist.php
plugins/OStatus/classes/Ostatus_profile.php
Merge tried to delete things that it seems it shouldn't, very confusing order. Hope rest of the cherry-picking isn't a problem.
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions