Merge branch 'development'

jg · jg · commit 173f854a26d8 · 2017-02-13T11:23:55.000-06:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Firebot",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "An application for Beam.pro that celebrates and promotes interactive controls.",
   "main": "main.js",
   "scripts": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "Firebot",`
`3`		`- "version": "2.0.0",`
	`3`	`+ "version": "2.1.0",`
`4`	`4`	`"description": "An application for Beam.pro that celebrates and promotes interactive controls.",`
`5`	`5`	`"main": "main.js",`
`6`	`6`	`"scripts": {`