release 1.2.0

CHANGELOG.md

@@ -1,3 +1,27 @@
+<a name"1.2.0"></a>
+## 1.2.0 (2015-07-13)
+
+This release moves some of the most popular extensions (such as table-extension and github-extension) to core.
+Also introduces a simple cli tool that you can use to quickly convert markdown files into html. 
+
+
+#### Bug Fixes
+
+* **headerLevelStart:** fix for NaN error when specifying a non number as headerLevelStart param ([be72b487](http://github.com/showdownjs/showdown/commit/be72b487))
+
+
+#### Features
+
+* **CLI:** simple cli tool (ALPHA) ([f6a33e40](http://github.com/showdownjs/showdown/commit/f6a33e40))
+* **flavours:** add markdown presets/flavors ([7e55bceb](http://github.com/showdownjs/showdown/commit/7e55bceb), closes [#164](http://github.com/showdownjs/showdown/issues/164))
+* **ghCodeBlocks:** add option to disable GH codeblocks ([c33f9888](http://github.com/showdownjs/showdown/commit/c33f9888))
+* **literalMidWordUnderscores:**  add support for GFM literal midword underscores ([0c0cd7db](http://github.com/showdownjs/showdown/commit/0c0cd7db))
+* **simplifiedAutoLink:** add support for GFM autolinks ([cff02372](http://github.com/showdownjs/showdown/commit/cff02372))
+* **strikethrough:**  add support for GFM strikethrough ([43e9448d](http://github.com/showdownjs/showdown/commit/43e9448d))
+* **tables:**  add support for GFM tables ([3a924e3c](http://github.com/showdownjs/showdown/commit/3a924e3c))
+* **tasklists:** add support for GFM tasklists ([dc72403a](http://github.com/showdownjs/showdown/commit/dc72403a))
+
+
 <a name"1.1.0"></a>
 ## 1.1.0 (2015-06-18)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "showdown",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "A Markdown to HTML converter written in Javascript",
   "author": "Estevão Santos",
   "homepage": "http://showdownjs.github.io/showdown/",