Merge branch 'master' into develop

showdownjs · Jan 25, 2016 · 8d0cf54 · 8d0cf54
2 parents 71a5873 + f4d50dc
commit 8d0cf54
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/package.json b/package.json
@@ -30,7 +30,7 @@
     "url": "https://github.com/showdownjs/showdown.git",
     "web": "https://github.com/showdownjs/showdown"
   },
-  "license": "BSD-2-Clause",
+  "license": "BSD-3-Clause",
   "main": "./dist/showdown.js",
   "scripts": {
     "test": "grunt test"