Merge branch 'master' into module-support

Conflicts:
	CHANGES
	docs/_themes
	tests/flask_tests.py
This commit is contained in:
Armin Ronacher 2010-05-12 01:04:35 +02:00
commit 9fa4f94ad8
9 changed files with 177 additions and 355 deletions

View file

@ -222,6 +222,8 @@ Useful Functions and Classes
.. autofunction:: redirect
.. autofunction:: send_file
.. autofunction:: escape
.. autoclass:: Markup