Merge branch '0.11-maintenance'

This commit is contained in:
Markus Unterwaditzer 2016-10-30 14:35:15 +01:00
commit 2b8fef4fe7
3 changed files with 3 additions and 3 deletions

View file

@ -55,7 +55,7 @@ into this file, :file:`flaskr/__init__.py`:
.. sourcecode:: python
from flaskr import app
from .flaskr import app
This import statement brings the application instance into the top-level
of the application package. When it is time to run the application, the

View file

@ -1 +1 @@
from flaskr.flaskr import app
from .flaskr import app

View file

@ -1,2 +1,2 @@
[aliases]
[tool:pytest]
test=pytest