Merge remote-tracking branch 'origin/development' into development

This commit is contained in:
Dustin Pianalto 2018-05-23 15:57:41 -08:00
commit 25384be8e2

View File

@ -3,5 +3,6 @@
"display_name" : "[ds!] Dev-Sebi",
"maintenance": "True",
"ownerlist": [],
"prefix": "ds!"
"prefix": "ds!",
"dbconnect": ""
}