Merge remote-tracking branch 'remotes/lorochka85/bug852_use_media_slug_instead_of_id'
[mediagoblin.git] / mediagoblin / templates / mediagoblin / media_displays /
drwxr-xr-x   ..
-rw-r--r-- 50 image.html
-rw-r--r-- 777 video.html