bump version, Changelog and Credits

showdownjs · May 28, 2015 · a3b412c · a3b412c
1 parent 5facec4
commit a3b412c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+<a name"1.0.2"></a>
+### 1.0.2 (2015-05-28)
+
+#### Bug Fixes
+
+ * **Gruntfile.js** add missing comma in footer. This bug prevented concatenating other js scripts and libraries
+ with showdown([5315508](http://github.com/showdownjs/showdown/commit/5315508). Credits to Alexandre Courtiol.
+
+
 <a name"1.0.1"></a>
 ### 1.0.1 (2015-05-27)
 

diff --git a/CREDITS.md b/CREDITS.md
@@ -33,6 +33,7 @@ Credits
       Bug fixing and late maintainer
     * [Hannah Wolfe](https://github.com/ErisDS)<br/>
       Bug fixes
+    * [Alexandre Courtiol](https://github.com/acourtiol)
 
   - Original Project
     * [John Gruber](http://daringfireball.net/projects/markdown/)<br/>

diff --git a/dist/showdown.js.map b/dist/showdown.js.map