summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2009-11-04 22:05:33 -0800
committerZach Copley <zach@status.net>2009-11-04 22:05:33 -0800
commit2149168d2995da0b89ee9eb6875d3899e04c783b (patch)
tree6a5de0e301a6bebaff5c6ea3c796820a5918d57e /js
parentf28795656f9250707b2180c93fe9946d5066017b (diff)
parent40bf174c0175df2d2de604f6887b90760faab74e (diff)
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
* '0.9.x' of gitorious.org:statusnet/mainline: Revert a OS X-specific change to PEAR MIME_Type that I accidentally commited.
Diffstat (limited to 'js')
0 files changed, 0 insertions, 0 deletions