Merge branch 'master' into feature-table-extension
Conflicts: README.md src/showdown.js
This commit is contained in:
commit
dc28410a3b
17 changed files with 150 additions and 77 deletions
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "showdown",
|
||||
"version": "0.2.0",
|
||||
"version": "0.3.0",
|
||||
"author": "John Fraser",
|
||||
"scripts": {
|
||||
"test": "mocha ./test/run.js"
|
||||
|
@ -14,7 +14,11 @@
|
|||
"Roger Braun",
|
||||
"Dominic Tarr",
|
||||
"Cat Chen",
|
||||
"Titus Stone"
|
||||
"Titus Stone",
|
||||
"Rob Sutherland",
|
||||
"Pavel Lang",
|
||||
"Ben Combee",
|
||||
"Adam Backstrom"
|
||||
],
|
||||
"repository": {
|
||||
"type": "git",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue