Commit 61a8eccf authored by Ozzieisaacs's avatar Ozzieisaacs

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	setup.cfg
parents d01a0c66 aba88ae5
...@@ -20,4 +20,4 @@ Pillow>=4.0.0 ...@@ -20,4 +20,4 @@ Pillow>=4.0.0
rarfile>=2.7 rarfile>=2.7
# other # other
natsort>=2.2.0 natsort>=2.2.0
git+https://github.com/OzzieIsaacs/comicapi/archive/5346716578b2843f54d522f44d01bc8d25001d24.zip#egg=comicapi git+https://github.com/OzzieIsaacs/comicapi.git@5346716578b2843f54d522f44d01bc8d25001d24#egg=comicapi
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment