From 2cc3e82ef357c88ebc8346064ea48988cd6ba00d Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Wed, 7 Dec 2016 18:18:53 -0500
Subject: [PATCH] -> v1.2.0

---
 CHANGELOG.md | 4 ++++
 package.json | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 231413a59f..c9f6d9f1ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Svelte changelog
 
+## 1.2.0
+
+* Server-side rendering of HTML ([#148](https://github.com/sveltejs/svelte/pull/148)) and CSS ([#154](https://github.com/sveltejs/svelte/pull/154))
+
 ## 1.1.3
 
 * Handle `xmlns` attributes correctly ([#142](https://github.com/sveltejs/svelte/issues/142))
diff --git a/package.json b/package.json
index ccc16fd0e7..0cfa078cb0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "svelte",
-  "version": "1.1.3",
+  "version": "1.2.0",
   "description": "The magical disappearing UI framework",
   "main": "compiler/svelte.js",
   "files": [