maya-chen/flask
1
0
Fork 0
forked from orbit-oss/flask
Code Pull requests Activity

Merged in changes from master by hand

Browse source
This commit is contained in:
Armin Ronacher 2010-07-04 11:25:26 +02:00
parent 81148db5b6
commit 8798b4b711
3 changed files with 37 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
flask/__init__.py
View file

@ -18,6 +18,6 @@ from jinja2 import Markup, escape
from flask.app import Flask
from flask.helpers import url_for, jsonify, json_available, flash, send_file, \
get_flashed_messages, render_template, render_template, render_template_string, \
get_template_attribute
get_template_attribute, json
from flask.globals import current_app, g, request, session, _request_ctx_stack
from flask.module import Module