Merge branch 'master' of github.com:mitsuhiko/flask

This commit is contained in:
Armin Ronacher 2010-07-30 00:03:25 +02:00
commit 138faab121

View file

@ -33,7 +33,7 @@ except ImportError:
json_available = False
from werkzeug import Headers, wrap_file, is_resource_modified, cached_property
from werkzeug import Headers, wrap_file, cached_property
from werkzeug.exceptions import NotFound
from jinja2 import FileSystemLoader