Merge branch 'master' of stigma:platforma

[redakcja.git] / project / settings.py

diff --git a/project/settings.py b/project/settings.py
index 143f292..3a1f3ad 100644 (file)
--- a/project/settings.py
+++ b/project/settings.py
@@ -8,6 +8,7 @@ TEMPLATE_DEBUG = DEBUG
 
 ADMINS = (
     (u'Marek Stępniowski', 'marek@stepniowski.com'),
 
 ADMINS = (
     (u'Marek Stępniowski', 'marek@stepniowski.com'),

+    (u'Łukasz Rekucki', 'lrekucki@gmail.com'),

 )
 
 MANAGERS = ADMINS
 )
 
 MANAGERS = ADMINS


@@ -30,8 +31,8 @@ TIME_ZONE = 'Europe/Warsaw Poland'
 # http://www.i18nguy.com/unicode/language-identifiers.html
 LANGUAGE_CODE = 'pl'
 
 # http://www.i18nguy.com/unicode/language-identifiers.html
 LANGUAGE_CODE = 'pl'
 

-import locale
-locale.setlocale(locale.LC_ALL, '')
+#import locale
+#locale.setlocale(locale.LC_ALL, '')

 
 SITE_ID = 1
 
 
 SITE_ID = 1
 


@@ -115,7 +116,8 @@ INSTALLED_APPS = (
     'django.contrib.sites',
     'django.contrib.admin',
     'django.contrib.admindocs',
     'django.contrib.sites',
     'django.contrib.admin',
     'django.contrib.admindocs',

-    
+
+    'piston',

     'explorer',
     'toolbar',
     'api',
     'explorer',
     'toolbar',
     'api',