Fixed merging confict

This commit is contained in:
Armin Ronacher 2010-05-02 12:09:31 +02:00
commit eeb0e94951
9 changed files with 147 additions and 13 deletions

View file

@ -183,6 +183,13 @@ To access the current session you can use the :class:`session` object:
# so mark it as modified yourself
session.modified = True
.. attribute:: permanent
If set to `True` the session life for
:attr:`~flask.Flask.permanent_session_lifetime` seconds. The
default is 31 days. If set to `False` (which is the default) the
session will be deleted when the user closes the browser.
Application Globals
-------------------