Bump version to v1.4.0-beta.2.

loususi · Jan 14, 2014 · 80f417b · 80f417b
1 parent 9d94785
commit 80f417b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Ember Changelog
 
+### Ember 1.4.0-beta.2 (January 14, 2014)
+
+* [BUGFIX] Fix stripping trailing slashes for * routes.
+* [SECURITY] Ensure primitive value contexts are escaped.
+* [SECURITY] Ensure {{group}} helper escapes properly.
+* Performance improvements.
+* [BUGFIX] Templete-less components properties should not collide with internal properties.
+
+
 ### Ember 1.4.0-beta.1 (January 6, 2014)
 
 * Unbound helper supports bound helper static strings.
@@ -9,6 +18,11 @@
 * [FEATURE propertyBraceExpansion] Add support for brace-expansion in dependent keys, observer and watch properties.
 * [FEATURE ember-metal-run-bind] Enables `Ember.run.bind` which is ember run-loop aware variation of jQuery.proxy.
 
+### Ember 1.3.1 (January 14, 2014)
+
+* [SECURITY] Ensure primitive value contexts are escaped.
+* [SECURITY] Ensure {{group}} helper escapes properly.
+
 ### Ember 1.3.0 (January 6, 2014)
 
 * Many documentation updates.

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -27,7 +27,7 @@ GIT
 PATH
   remote: .
   specs:
-    ember-source (1.4.0.beta.2.pre)
+    ember-source (1.4.0.beta.2)
       handlebars-source (~> 1.3.0)
 
 GEM

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.4.0-beta.2+pre
+1.4.0-beta.2