Merge changelog.

horde · Jul 8, 2014 · 1251ea3 · 1251ea3
1 parent 0dfe9ec
commit 1251ea3
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/trean/docs/CHANGES b/trean/docs/CHANGES
@@ -1,11 +1,18 @@
 ----------
-v1.1.0-git
+v1.2.0-git
 ----------
 
 [mjr] Add new block for displaying bookmarks tagged with a certain set of tags
       (Request #13020).
 
 
+------
+v1.1.0
+------
+
+[mjr] Fix creating tags from folder names when importing bookmarks.
+
+
 ---------
 v1.1.0RC1
 ---------