Merge branch 'master' into reduce-ci-matrix

This commit is contained in:
Kenneth Reitz 2017-05-27 13:46:18 -04:00
commit 1ee439adff

View file

@ -25,7 +25,7 @@ on the module level.
exist: exist:
- while a request is active, the context local objects - while a request is active, the context local objects
(:data:`flask.request` and others) point to the current request. (:data:`flask.request` and others) point to the current request.
- any code can get hold of these objects at any time. - any code can get hold of these objects at any time.
3. There is also a third state somewhere in between 'module-level' and 3. There is also a third state somewhere in between 'module-level' and