Merge branch 'attachment-fixup' into 0.8.x
authorZach Copley <zach@controlyourself.ca>
Sat, 27 Jun 2009 01:32:18 +0000 (18:32 -0700)
committerZach Copley <zach@controlyourself.ca>
Sat, 27 Jun 2009 01:32:18 +0000 (18:32 -0700)
commita68722c9c75cd9dc8ed84e186f3b4ecc5556b1a3
tree564b804360160c908fe6c4469824f1ee9c194b25
parent60b47d879781e28c0f08978bba43d5b9ad22b32a
parent96ba25c34bc03c5b72c13241a00e467a0585cd2a
Merge branch 'attachment-fixup' into 0.8.x

* attachment-fixup:
  Added readonly flag to FileAction just in case
  Make shorturls in notice content point to AttachmentAction urls
  Add attachment action back into router