Merge branch '0.11-maintenance'

2016-10-30 14:35:15 +01:00 · 2016-10-30 14:35:15 +01:00 · 2b8fef4fe7
commit 2b8fef4fe7
parent 2cc76628d2 fa087c8929
3 changed files with 3 additions and 3 deletions
--- a/examples/flaskr/flaskr/init.py
+++ b/examples/flaskr/flaskr/init.py
@ -1 +1 @@
-from flaskr.flaskr import app
+from .flaskr import app
--- a/examples/flaskr/setup.cfg
+++ b/examples/flaskr/setup.cfg
@ -1,2 +1,2 @@
-[aliases]
+[tool:pytest]
 test=pytest