]> 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>
Fri, 10 Jul 2009 22:28:26 +0000 (15:28 -0700)
committerZach Copley <zach@controlyourself.ca>
Fri, 10 Jul 2009 22:28:26 +0000 (15:28 -0700)
* '0.8.x' of git@gitorious.org:laconica/mainline:
  When a notice is posted with an attachment, the facebook stream update has media displayed inline, or as links.


Trivial merge