]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x
authorZach Copley <zach@controlyourself.ca>
Tue, 14 Jul 2009 17:43:13 +0000 (10:43 -0700)
committerZach Copley <zach@controlyourself.ca>
Tue, 14 Jul 2009 17:43:13 +0000 (10:43 -0700)
* '0.8.x' of git@gitorious.org:laconica/mainline:
  HTML "File"/attachments should probably not be considered enclosures.
  Moved the decision logic as to whether an attachment should be an enclosure to the File class


Trivial merge