summaryrefslogtreecommitdiff
path: root/base_urls.py
diff options
context:
space:
mode:
authorluxagraf <sng@luxagraf.net>2011-02-23 11:28:37 -0600
committerluxagraf <sng@luxagraf.net>2011-02-23 11:28:37 -0600
commit98cbbb27f83c8d7b38cad810cab83f7e5e639d4e (patch)
tree8c740f3661ff2b6c55e2b33cb9574a2ba37c379e /base_urls.py
parentfc776ae0e6d85ed5e51b83291ca943f2d740bd43 (diff)
parentb9f40c0c9df3167d28f131cecd566190e18b459e (diff)
Merge branch 'master' of http://git.luxagraf.net/luxagraf
Diffstat (limited to 'base_urls.py')
-rw-r--r--base_urls.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/base_urls.py b/base_urls.py
index 24acc93..1b18ce6 100644
--- a/base_urls.py
+++ b/base_urls.py
@@ -43,7 +43,7 @@ urlpatterns += patterns('',
urlpatterns += patterns('',
(r'^admin/doc/', include('django.contrib.admindocs.urls')),
(r'^admin/filebrowser/', include('filebrowser.urls')),
- (r'^admin/', include(admin.site.urls),{'SSL':True}),
+ (r'^admin/', include(admin.site.urls),{'SSL':False}),
(r'^grappelli/', include('grappelli.urls')),
(r'^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}),
(r'^robots.txt$', direct_to_template, {'template': 'archives/robots.html'}),