Merge branch 'master' into develop

This commit is contained in:
Estevão Soares dos Santos 2016-01-25 03:04:33 +00:00
commit 8d0cf545b8

View File

@ -30,7 +30,7 @@
"url": "https://github.com/showdownjs/showdown.git", "url": "https://github.com/showdownjs/showdown.git",
"web": "https://github.com/showdownjs/showdown" "web": "https://github.com/showdownjs/showdown"
}, },
"license": "BSD-2-Clause", "license": "BSD-3-Clause",
"main": "./dist/showdown.js", "main": "./dist/showdown.js",
"scripts": { "scripts": {
"test": "grunt test" "test": "grunt test"