From 0641bfd8e6f9ec0502d28dc0a05fc104d6a93a9f Mon Sep 17 00:00:00 2001
From: Ali-Akber Saifee <ali@indydevs.org>
Date: Tue, 25 Feb 2020 15:09:41 -0800
Subject: [PATCH] updating changelog for  1.2.0

---
 HISTORY.rst | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/HISTORY.rst b/HISTORY.rst
index 574505e0..6e4e4f03 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -3,6 +3,15 @@
 Changelog
 =========
 
+1.2.0 2020-02-25
+----------------
+* Add `override_defaults` argument to decorated limits to allow combinined defaults with decorated limits.
+* Add configuration parameter RATELIMIT_DEFAULTS_PER_METHOD to control whether defaults are applied per method.
+* Add support for in memory fallback without override (`Pull Request 236 <https://github.com/alisaifee/flask-limiter/pull/236>`_)
+* Bug fix
+
+  * Ensure defaults are enforced when decorated limits are skipped (`Issue 238 <https://github.com/alisaifee/flask-limiter/issues/238>`_)
+
 1.1.0 2019-10-02
 ----------------
 * Provide Rate limit information with Exception (`Pull Request 202 <https://github.com/alisaifee/flask-limiter/pull/202>`_)
@@ -283,5 +292,6 @@ Changelog
 
 
 
+