Merge branch 'master' of https://gitee.com/WuXianChaoPin/PixivSearch
# Conflicts: # PixivSearch/dao/bangumi.py # PixivSearch/pixiv/pixiv.py # PixivSearch/settings.py # PixivSearch/templates/index.html # PixivSearch/thrift/task/TSDM-remote # PixivSearch/view.py # root.ini # root.pymaster
commit
2f1006d2ff
Loading…
Reference in new issue