From 7928c9c48db192eb5a8a98ed0483f07d08d3f262 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Thu, 15 Dec 2016 14:26:25 -0500
Subject: [PATCH] -> v1.2.5

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a61e0f7391..e39f6af639 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Svelte changelog
 
+## 1.2.5
+
+* Allow whitelisted globals in templates ([#185](https://github.com/sveltejs/svelte/issues/185))
+* Intercept parse errors with `options.onerror`
+
 ## 1.2.4
 
 * SSR compiler: Implement `{{{tripes}}}` ([#197](https://github.com/sveltejs/svelte/issues/197))
diff --git a/package.json b/package.json
index b3d58157a9..d8f4e34922 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "svelte",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "description": "The magical disappearing UI framework",
   "main": "compiler/svelte.js",
   "files": [