Merge branch 'develop'

CHANGELOG.md

@@ -1,3 +1,12 @@
+<a name"1.0.1"></a>
+### 1.0.1 (2015-05-27)
+
+
+#### Bug Fixes
+
+* **bower.json:** update bower.json main attribute to point to dist directory ([bc3a092f](http://github.com/showdownjs/showdown/commit/bc3a092f))
+
+
 <a name"1.0.0"></a>
 ## 1.0.0 (2015-05-27)
 

bower.json

@@ -3,24 +3,31 @@
     "description": "A Markdown to HTML converter written in Javascript",
     "homepage": "https://github.com/showdownjs/showdown",
     "authors": [
-        "Estevão Santos (https://github.com/tivie)",
-        "Pascal Deschênes (https://github.com/pdeschen)",
-        "Corey Innis (https://github.com/coreyti)",
-        "John Fraser"
+      "Estevão Santos (https://github.com/tivie)",
+      "Pascal Deschênes (https://github.com/pdeschen)"
     ],
-    "main": ["src/showdown.js"],
+    "main": ["dist/showdown.js"],
     "ignore": [
-        ".jshintrc",
-        "perlMarkdown/*"
+      ".editorconfig",
+      ".gitattributes",
+      ".gitignore",
+      ".jscs.json",
+      ".jshintignore",
+      ".jshintrc",
+      ".travis.yml",
+      "Gruntfile.js",
+      "package.json",
+      "src/*",
+      "test/*"
     ],
     "repository": {
-        "type": "git",
-        "url": "https://github.com/showdownjs/showdown.git"
+      "type": "git",
+      "url": "https://github.com/showdownjs/showdown.git"
     },
     "keywords": [
-        "markdown",
-        "md",
-        "mdown"
+      "markdown",
+      "md",
+      "mdown"
     ],
     "license": "https://github.com/showdownjs/showdown/blob/master/license.txt"
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "showdown",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "A Markdown to HTML converter written in Javascript",
   "authors": "Estevão Santos",
   "contributors": [