Merge branch 'video_gstreamer-only'

Browse Source

Conflicts:
	mediagoblin/db/migrations.py
	mediagoblin/submit/views.py

...

This commit is contained in:

Joar Wandborg

2011-11-21 21:51:30 +01:00

parent e56e5f8c5c c875bb74a8

commit b9e1fa280e

25 changed files with 2993 additions and 32 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

mediagoblin/static/images/media_thumbs/video.jpg Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 7.1 KiB