Merged branches.
authorMadhusudan.C.S <madhusudancs@gmail.com>
Wed, 02 Sep 2009 20:28:13 +0530
changeset 8 b6b90b65881f
parent 7 e49daa7af035 (diff)
parent 6 eb8e00312877 (current diff)
child 9 962fe221025e
Merged branches.
--- a/urls.py	Wed Sep 02 10:57:07 2009 -0400
+++ b/urls.py	Wed Sep 02 20:28:13 2009 +0530
@@ -1,4 +1,5 @@
 from django.conf.urls.defaults import *
+from django.conf import settings
 
 # Uncomment the next two lines to enable the admin:
 # from django.contrib import admin