Merge branch 'development'

Ionaru · Ionaru · commit d27e70d99cc6 · 2018-04-23T15:54:26.000+02:00
diff --git a/README.md b/README.md
@@ -13,6 +13,9 @@ Changes include:
 
 My intention is to continue development on this project, improving it and keeping it alive.
 
+[![npm version](https://badge.fury.io/js/easymde.svg)](https://badge.fury.io/js/easymde)
+[![Build Status](https://travis-ci.org/Ionaru/easy-markdown-editor.svg?branch=development)](https://travis-ci.org/Ionaru/easy-markdown-editor)
+
 ## Install EasyMDE
 Via [npm](https://www.npmjs.com/package/easymde).
 ```
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "easymde",
-    "version": "1.0.0",
+    "version": "2.0.0",
     "description": "A simple, beautiful, and embeddable JavaScript Markdown editor that easy to use. Features include autosaving and spell checking.",
     "keywords": [
         "embeddable",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "easymde",`
`3`		`- "version": "1.0.0",`
	`3`	`+ "version": "2.0.0",`
`4`	`4`	`"description": "A simple, beautiful, and embeddable JavaScript Markdown editor that easy to use. Features include autosaving and spell checking.",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"embeddable",`