diff --git a/CHANGES b/CHANGES index d646383e..69648f23 100644 --- a/CHANGES +++ b/CHANGES @@ -17,6 +17,7 @@ Version 1.0 - Made Flask support custom JSON mimetypes for incoming data. - Added support for returning tuples in the form ``(response, headers)`` from a view function. +- Added :meth:`flask.Config.from_json`. Version 0.10.2 -------------- diff --git a/flask/config.py b/flask/config.py index 41909857..2ed5c180 100644 --- a/flask/config.py +++ b/flask/config.py @@ -175,6 +175,8 @@ class Config(dict): root path. :param silent: set to `True` if you want silent failure for missing files. + + .. versionadded:: 1.0 """ filename = os.path.join(self.root_path, filename)