summaryrefslogtreecommitdiff
path: root/greenbox/urls.py
diff options
context:
space:
mode:
authorMike Crute <mcrute@gmail.com>2015-07-29 18:33:04 -0700
committerMike Crute <mcrute@gmail.com>2015-07-29 18:33:04 -0700
commitc29586b5ddf030ebc406aa7008ebfefc858a0af4 (patch)
treeb4b3ba26bb2b4ceb25f122b7f39216816723f080 /greenbox/urls.py
parent1b2bd5c3fd47515ca8e96b4dce1b9ca9b88b5cb1 (diff)
downloadgreenbox-master.tar.bz2
greenbox-master.tar.xz
greenbox-master.zip
Sync from serverHEADmaster
Diffstat (limited to 'greenbox/urls.py')
-rw-r--r--greenbox/urls.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/greenbox/urls.py b/greenbox/urls.py
index fb38894..1e6b755 100644
--- a/greenbox/urls.py
+++ b/greenbox/urls.py
@@ -1,5 +1,7 @@
1from django.conf.urls.defaults import patterns, include, url 1from django.conf.urls import patterns, include, url
2from django.contrib import admin; admin.autodiscover() 2
3from django.contrib import admin
4admin.autodiscover()
3 5
4urlpatterns = patterns('', 6urlpatterns = patterns('',
5 url(r'^admin/', include(admin.site.urls)), 7 url(r'^admin/', include(admin.site.urls)),