Merge branch 'develop' into release/0.3.0

Half-Shot · Half-Shot · commit faefe4c99b49 · 2018-10-26T01:46:08.000+01:00
diff --git a/package.json b/package.json
@@ -28,7 +28,7 @@
     "as"
   ],
   "author": "Half-Shot",
-  "license": "MIT",
+  "license": "APACHE-2",
   "bugs": {
     "url": "https://github.com/Half-Shot/matrix-appservice-discord/issues"
   },
