aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/edit/routing.py
diff options
context:
space:
mode:
authorJef van Schendel <jefvanschendel@gmail.com>2011-06-06 14:46:56 +0200
committerJef van Schendel <jefvanschendel@gmail.com>2011-06-06 14:46:56 +0200
commitec8f66bd650e580eae67ad97fbc81776365d84f2 (patch)
tree499c0c5ef2868c8f3de724133a9f468122c79589 /mediagoblin/edit/routing.py
parentf4b2bd93f2f9c0f5fbef5214b2fe97912857b175 (diff)
parent3aa4c668b9bfe53ed58d4ae21ed91210df7ad9ff (diff)
downloadmediagoblin-ec8f66bd650e580eae67ad97fbc81776365d84f2.tar.lz
mediagoblin-ec8f66bd650e580eae67ad97fbc81776365d84f2.tar.xz
mediagoblin-ec8f66bd650e580eae67ad97fbc81776365d84f2.zip
Merge remote-tracking branch 'gitorious/master'
Diffstat (limited to 'mediagoblin/edit/routing.py')
-rw-r--r--mediagoblin/edit/routing.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mediagoblin/edit/routing.py b/mediagoblin/edit/routing.py
index 54f2661a..bf0b2498 100644
--- a/mediagoblin/edit/routing.py
+++ b/mediagoblin/edit/routing.py
@@ -14,9 +14,9 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
from routes.route import Route
edit_routes = [
- Route('mediagoblin.edit.edit_media', "/{user}/{media}/",
- controller="mediagoblin.edit.views:edit_media"),
+ # Media editing view handled in user_pages/routing.py
]