dépôts
/
cavote.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
90a7047
)
Fix error during merge
author
Arnaud Delcasse
<arnaud@delcasse.fr>
Tue, 4 Sep 2012 19:21:43 +0000
(21:21 +0200)
committer
Arnaud Delcasse
<arnaud@delcasse.fr>
Tue, 4 Sep 2012 19:21:43 +0000
(21:21 +0200)
main.py
patch
|
blob
|
history
diff --git
a/main.py
b/main.py
index
3ac3664
..
fc18674
100755
(executable)
--- a/
main.py
+++ b/
main.py
@@
-17,7
+17,8
@@
import string
from settings import *
-app = Flask(__name__) app.config.from_object(__name__)
+app = Flask(__name__)
+app.config.from_object(__name__)
oid = OpenID(app)