diff options
| author | Zach Copley <zach@status.net> | 2010-03-18 17:11:06 -0700 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2010-03-18 17:11:06 -0700 |
| commit | a6c9445f0de1a74ffc81dda12eaba6ee36410716 (patch) | |
| tree | 873d6a67626ef324c0102153c6a027291767b878 /actions/outbox.php | |
| parent | 051bee988caa4a8d3648fae9f963cb35d26c13c5 (diff) | |
| parent | 1301877dfe89c57c182246c0d7ba0ff6335fd17b (diff) | |
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
* 'testing' of gitorious.org:statusnet/mainline:
OStatus discover fixes:
Remove xpm support (no one really uses it, and IMAGETYPE_XPM is undefined, causing warnings)
Fix notice warning about unused var -- was renamed during refactoring.
Diffstat (limited to 'actions/outbox.php')
0 files changed, 0 insertions, 0 deletions