From 8d08895100d9d20a6ed8a3de5204243fb3bc40a0 Mon Sep 17 00:00:00 2001
From: ocefpaf <ocefpaf@gmail.com>
Date: Fri, 12 Feb 2016 16:32:42 -0300
Subject: [PATCH] Updated changelog

---
 CHANGES.txt | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 566828063b..318206ba21 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,23 @@
-0.2.0.dev
-~~~~~~~~~
-TODO
-
+0.2.0
+~~~~~
+Major changes to the API with the new plugin system,
+and several new features in this version. For more information check the docs:
+http://python-visualization.github.io/folium/
+
+- Added control_scale (BibMartin and jelmelk #355)
+- WMS styles (ocefpaf #348)
+- Docs! (BibMartin #344, #337, #329)
+- No tile option (ocefpaf #330)
+- GeoJSON and TopoJSON `style_function` (BibMartin #317 and #266)
+- Colormaps (BibMartin # 300)
+- Map CRS (BibMartin #297)
+- GeoPandas drawing (BibMartin #296)
+- Div Icons (BibMartin #250)
+- CustomIcon (BibMartin #230)
+- HeatMap (BibMartin #213)
+
+And many bug fixes.
+See https://github.com/python-visualization/folium/issues?&q=milestone:v0.2.0+is:closed+label:bug
 
 0.1.6
 ~~~~~