diff options
| author | Joar Wandborg <git@wandborg.com> | 2011-11-21 21:51:30 +0100 |
|---|---|---|
| committer | Joar Wandborg <git@wandborg.com> | 2011-11-21 21:51:30 +0100 |
| commit | b9e1fa280edfff4daf424bbcf51bd651ed00f411 (patch) | |
| tree | 9f373c6443874bc5542115a79860da5957a1e182 /mediagoblin/static | |
| parent | e56e5f8c5c3dc7909aa68a1543ed04ddb18e27f6 (diff) | |
| parent | c875bb74a8245b39b6985f37cb8ab838c22efa7e (diff) | |
| download | mediagoblin-b9e1fa280edfff4daf424bbcf51bd651ed00f411.tar.lz mediagoblin-b9e1fa280edfff4daf424bbcf51bd651ed00f411.tar.xz mediagoblin-b9e1fa280edfff4daf424bbcf51bd651ed00f411.zip | |
Merge branch 'video_gstreamer-only'
Conflicts:
mediagoblin/db/migrations.py
mediagoblin/submit/views.py
Diffstat (limited to 'mediagoblin/static')
| -rw-r--r-- | mediagoblin/static/images/media_thumbs/video.jpg | bin | 0 -> 7278 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/mediagoblin/static/images/media_thumbs/video.jpg b/mediagoblin/static/images/media_thumbs/video.jpg Binary files differnew file mode 100644 index 00000000..841dc796 --- /dev/null +++ b/mediagoblin/static/images/media_thumbs/video.jpg |
