From 0ea3a73ae550808f30db656c9b3a5c22959785ee Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Thu, 16 Jul 2015 09:54:42 +0100
Subject: [PATCH] version 1.0 (for real this time)

Conflicts:
	CHANGELOG.txt
---
 CHANGELOG.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 61aea034c2..61aebf42c1 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -13,7 +13,7 @@ Changelog
  * Fix: Text areas in the non-default tab of the page editor now resize to the correct height
 
 
-1.0 (xx.xx.xxxx)
+1.0 (16.07.2015)
 ~~~~~~~~~~~~~~~~
 
  * Added StreamField, a model field for freeform page content