From: Tony Mack Date: Tue, 9 Apr 2013 23:06:56 +0000 (-0400) Subject: updated urls X-Git-Tag: 1.0~147 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=af4c5e9a34245410885d90d34cd2c136379a66dd;p=plstackapi.git updated urls --- diff --git a/plstackapi/planetstack/urls.py b/plstackapi/planetstack/urls.py deleted file mode 100644 index c0a4443..0000000 --- a/plstackapi/planetstack/urls.py +++ /dev/null @@ -1,26 +0,0 @@ -from django.conf.urls import patterns, include, url - -# Uncomment the next two lines to enable the admin: -from django.contrib import admin -from plstackapi.planetstack.api_root import api_root -from rest_framework import generics - -admin.autodiscover() - -urlpatterns = patterns('', - # Examples: - # url(r'^$', 'planetstack.views.home', name='home'), - # url(r'^planetstack/', include('planetstack.foo.urls')), - - # Uncomment the admin/doc line below to enable admin documentation: - # url(r'^admin/doc/', include('django.contrib.admindocs.urls')), - - # Uncomment the next line to enable the admin: - url(r'^admin/', include(admin.site.urls)), - - url(r'^plstackapi/$', api_root), - - #Adding in rest_framework urls - url(r'^plstackapi/', include('rest_framework.urls', namespace='rest_framework')), - -)