From: Julien Rabier <taziden@flexiden.org>
Date: Mon, 3 Sep 2012 19:20:37 +0000 (+0200)
Subject: Merge branch 'reorganize_files' of git.ndn.cx:cavote
X-Git-Url: http://git.cyclocoop.org/?p=cavote.git;a=commitdiff_plain;h=0f93afde08f333a6615145615f424db26240b512

Merge branch 'reorganize_files' of git.ndn.cx:cavote

Conflicts:
	main.py
---

0f93afde08f333a6615145615f424db26240b512
diff --cc main.py
index d56e251,5cc7e32..3ac3664
--- a/main.py
+++ b/main.py
@@@ -15,18 -15,10 +15,9 @@@ import hashli
  import smtplib
  import string
  
- DATABASE = '/tmp/cavote.db'
- PASSWD_SALT = 'change this value to some random chars!'
- SECRET_KEY = '{J@uRKO,xO-PK7B,jF?>iHbxLasF9s#zjOoy=+:'
- DEBUG = True
- TITLE = u"Cavote FFDN"
- EMAIL = '"' + TITLE + '"' + ' <' + u"cavote@ffdn.org" + '>'
- VERSION = "cavote 0.2.0"
- SMTP_SERVER = "127.0.0.1"
- PATTERNS = {u'Oui/Non': [u'Oui', u'Non'], u'Oui/Non/Blanc': [u'Oui', u'Non', u'Blanc'], u'Oui/Non/Peut-être': [u'Oui', u'Non', u'Peut-être']}
- 
- app = Flask(__name__)
- app.config.from_object(__name__)
+ from settings import *
+ 
 -app = Flask(__name__)
 -app.config.from_object(__name__)
++app = Flask(__name__) app.config.from_object(__name__)
  
  oid = OpenID(app)