Add Config.from_json to changelog

11 years ago · 97411295e3
2 changed files with 3 additions and 0 deletions
--- a/1
+++ b/1
@ -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
 --------------
--- 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)