Merge branch 'master' of github.com:gchandrasa/idpythonproject

adesst · adesst · commit 2d391efc2ad2 · 2012-04-21T15:03:52.000+07:00
Conflicts:
	idpython/urls.py
diff --git a/idpython/settings.py b/idpython/settings.py
@@ -30,7 +30,7 @@
 # timezone as the operating system.
 # If running in a Windows environment this must be set to the same as your
 # system time zone.
-TIME_ZONE = 'America/Chicago'
+TIME_ZONE = 'Asia/Jakarta'
 
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html
@@ -138,7 +138,7 @@
     'django.contrib.messages',
     'django.contrib.staticfiles',
     # Uncomment the next line to enable the admin:
-    # 'django.contrib.admin',
+    'django.contrib.admin',
     # Uncomment the next line to enable admin documentation:
     # 'django.contrib.admindocs',
 
diff --git a/idpython/urls.py b/idpython/urls.py
@@ -1,8 +1,8 @@
 from django.conf.urls import patterns, include, url
 
 # Uncomment the next two lines to enable the admin:
-# from django.contrib import admin
-# admin.autodiscover()
+from django.contrib import admin
+admin.autodiscover()
 
 urlpatterns = patterns('',
     # Examples:
@@ -16,4 +16,5 @@
     # url(r'^admin/', include(admin.site.urls)),
     #(r'^admin/', include(admin.site.urls)),
     url(r'^', include('cms.urls')),
+    url(r'^admin/', include(admin.site.urls)),
 )
