Merge remote-tracking branch 'origin/master'
# Conflicts: # setup.cfg
Showing
... | @@ -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 |
Please
register
or
sign in
to comment