merge + bump requirements.min.txt

Taaku18 · Taaku18 · commit 722db7be6e88 · 2019-08-05T09:33:18.000-06:00
diff --git a/.github/pull.yml b/.github/pull.yml
@@ -0,0 +1,8 @@
+version: "1"
+rules:
+  - base: master
+    upstream: kyb3r:master
+    mergeMethod: hardreset
+  - base: development
+    upstream: kyb3r:development
+    mergeMethod: hardreset
diff --git a/requirements.min.txt b/requirements.min.txt
@@ -3,7 +3,7 @@
 # To install requirements.txt run: pip install -r requirements.min.txt
 
 aiohttp==3.5.4
-discord.py==1.1.1
+discord.py==1.2.3
 dnspython==1.16.0
 emoji==0.5.2
 isodate==0.6.0
