Merge branch with release

- updated change log
oroinc · Sep 12, 2013 · 6d2bc67 · 6d2bc67
1 parent 79c4c60
commit 6d2bc67
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,7 @@ This changelog references the relevant changes (new features, changes and bugs)
 
 * 1.0.0-alpha6 (2013-09-12)
  * Maintenance Mode
- * Instant messaging between the browser and the web server
+ * WebSocket messaging between browser and the web server
  * Asynchronous Module Definition of JS resources
  * Added multiple sorting for a Grid
  * System configuration