Skip to content

Commit 9fa4f94

Browse files
mitsuhikomitsuhiko
committed
Merge branch 'master' into module-support
Conflicts: CHANGES docs/_themes tests/flask_tests.py
2 parents de909b3 + f80e1d3 commit 9fa4f94

File tree

9 files changed

+177
-355
lines changed

9 files changed

+177
-355
lines changed

‎.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "docs/_themes"]
2+
path = docs/_themes
3+
url = git://github.com/mitsuhiko/flask-sphinx-themes.git

‎CHANGES

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ Version 0.2
1515
view function.
1616
- server listens on 127.0.0.1 by default now to fix issues with chrome.
1717
- added external URL support.
18+
- added support for :func:`~flask.send_file`
1819
- module support and internal request handling refactoring
1920
to better support pluggable applications.
2021

‎docs/_themes

Submodule _themes added at 11cb6b5

‎docs/_themes/flasky/static/flasky.css_t

Lines changed: 0 additions & 344 deletions
This file was deleted.

‎docs/_themes/flasky/theme.conf

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎docs/api.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,8 @@ Useful Functions and Classes
222222

223223
.. autofunction:: redirect
224224

225+
.. autofunction:: send_file
226+
225227
.. autofunction:: escape
226228

227229
.. autoclass:: Markup

0 commit comments

Comments
 (0)