Merge remote-tracking branch 'gsoc2016/Subtitle-1'

[mediagoblin.git] / mediagoblin / user_pages / routing.py

diff --git a/mediagoblin/user_pages/routing.py b/mediagoblin/user_pages/routing.py
index beb16a0f74176bb44bd845296c71d2f630e8cb40..73371b6d2e053772c506a25d0a2561f128c6ab30 100644 (file)
--- a/mediagoblin/user_pages/routing.py
+++ b/mediagoblin/user_pages/routing.py
@@ -111,16 +111,6 @@ add_route('mediagoblin.edit.attachments',
           '/u/<string:user>/m/<int:media_id>/attachments/',
           'mediagoblin.edit.views:edit_attachments')
 
-add_route('mediagoblin.edit.subtitles',
-          '/u/<string:user>/m/<int:media_id>/subtitles/',
-          'mediagoblin.edit.views:edit_subtitles')
-
-
 add_route('mediagoblin.edit.metadata',
           '/u/<string:user>/m/<int:media_id>/metadata/',
-          'mediagoblin.edit.views:edit_metadata')
-
-
-add_route('mediagoblin.edit.custom_subtitles',
-          '/u/<string:user>/m/<int:media_id>/c_s/<string:path>',
-          'mediagoblin.edit.views:custom_subtitles')
\ No newline at end of file
+          'mediagoblin.edit.views:edit_metadata')
\ No newline at end of file