Merge branch 'database-refactor'

TheSamLloyd · TheSamLloyd · commit 163874ddbd4a · 2018-05-12T00:33:50.000-04:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "elbie",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "discord bot designed to handle dungeon world and a few other ttrpgs",
   "main": "elbie.js",
   "dependencies": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "elbie",`
`3`		`- "version": "1.0.0",`
	`3`	`+ "version": "1.1.0",`
`4`	`4`	`"description": "discord bot designed to handle dungeon world and a few other ttrpgs",`
`5`	`5`	`"main": "elbie.js",`
`6`	`6`	`"dependencies": {`