Merge branch 'master' into module-support

Conflicts: CHANGES docs/_themes tests/flask_tests.py
pallets · May 11, 2010 · 9fa4f94 · 9fa4f94
2 parents de909b3 + f80e1d3
commit 9fa4f94
Show file tree

Hide file tree

Showing 9 changed files with 177 additions and 355 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "docs/_themes"]
+	path = docs/_themes
+	url = git://github.com/mitsuhiko/flask-sphinx-themes.git
diff --git a/CHANGES b/CHANGES
@@ -15,6 +15,7 @@ Version 0.2
   view function.
 - server listens on 127.0.0.1 by default now to fix issues with chrome.
 - added external URL support.
+- added support for :func:`~flask.send_file`
 - module support and internal request handling refactoring
   to better support pluggable applications.
 

diff --git a/docs/_themes b/docs/_themes
diff --git a/docs/_themes/flasky/static/flasky.css_t b/docs/_themes/flasky/static/flasky.css_t
diff --git a/docs/_themes/flasky/theme.conf b/docs/_themes/flasky/theme.conf
diff --git a/docs/api.rst b/docs/api.rst
@@ -222,6 +222,8 @@ Useful Functions and Classes
 
 .. autofunction:: redirect
 
+.. autofunction:: send_file
+
 .. autofunction:: escape
 
 .. autoclass:: Markup