diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-03-18 12:12:41 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-03-18 12:12:41 -0500 |
| commit | 94e605237512daa518bcab9b59edbc1107840006 (patch) | |
| tree | eb1aa0b714c536f68474f0853c251ed4c5d683cf /mediagoblin/static/js | |
| parent | bf0f67ad6547e2073770942ddf66f23d3181831a (diff) | |
| parent | 54477b4d76ca983e2e884fea9c0975c7e63fdc1d (diff) | |
| download | mediagoblin-94e605237512daa518bcab9b59edbc1107840006.tar.lz mediagoblin-94e605237512daa518bcab9b59edbc1107840006.tar.xz mediagoblin-94e605237512daa518bcab9b59edbc1107840006.zip | |
Merge branch 'master' into derek-moore-bug405_email_notifications_for_comments
Conflicts:
mediagoblin/db/mongo/migrations.py
Diffstat (limited to 'mediagoblin/static/js')
| l--------- | mediagoblin/static/js/extlib/video-js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mediagoblin/static/js/extlib/video-js b/mediagoblin/static/js/extlib/video-js new file mode 120000 index 00000000..35da21ca --- /dev/null +++ b/mediagoblin/static/js/extlib/video-js @@ -0,0 +1 @@ +../../../../extlib/video-js
\ No newline at end of file |