Merge branch 'master' of https://github.com/sgoudham/discordenso

4 years ago · b542135b66
parent 3eb81ca2db 30e9f88526
commit b542135b66
7 changed files with 4 additions and 1 deletions
--- a/.idea/dictionaries/sgoud.xml
+++ b/.idea/dictionaries/sgoud.xml
@ -5,9 +5,11 @@
      <w>eightball</w>
      <w>ffmpeg</w>
      <w>hamothy</w>
+      <w>himiko</w>
      <w>kakashi</w>
      <w>oken</w>
      <w>simp</w>
+      <w>suoh</w>
      <w>tamaki</w>
      <w>waifu</w>
      <w>waifus</w>
--- a/requirements.txt
+++ b/requirements.txt
@ -7,3 +7,4 @@ python-dotenv~=0.13.0
 python-decouple
 tenorpy
 youtube-dl
+ffmpeg
--- a/venv/Lib/site-packages/ffmpeg/pycache/init.cpython-36.pyc
+++ b/venv/Lib/site-packages/ffmpeg/pycache/init.cpython-36.pyc
--- a/venv/Lib/site-packages/ffmpeg/pycache/audio.cpython-36.pyc
+++ b/venv/Lib/site-packages/ffmpeg/pycache/audio.cpython-36.pyc
--- a/venv/Lib/site-packages/ffmpeg/pycache/image.cpython-36.pyc
+++ b/venv/Lib/site-packages/ffmpeg/pycache/image.cpython-36.pyc
--- a/venv/Lib/site-packages/ffmpeg/pycache/stream.cpython-36.pyc
+++ b/venv/Lib/site-packages/ffmpeg/pycache/stream.cpython-36.pyc
--- a/venv/Lib/site-packages/ffmpeg/pycache/video.cpython-36.pyc
+++ b/venv/Lib/site-packages/ffmpeg/pycache/video.cpython-36.pyc