From e695abf9535d03db393b155faf5bdaff9b8dfba5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?=
 <david.barragan@kaleidos.net>
Date: Tue, 4 Nov 2014 10:36:19 +0100
Subject: [PATCH] Update changelog

---
 CHANGELOG.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab985b0f..b4647a22 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog #
 
-## 1.2.0 (Unreleased)
+## 1.2.0 Picea obovata (2014-11-04)
 
 ### Features
 - Send an email to the user on signup.
@@ -8,9 +8,9 @@
 - Support for custom text when inviting users.
 
 ### Misc
-- Lots of small and not so small bugfixes
+- Lots of small and not so small bugfixes.
 
-## 1.1.0 (2014-10-13)
+## 1.1.0 Alnus maximowiczii (2014-10-13)
 
 ### Misc
 - Fix bugs related to unicode chars on attachments.