Merge branch 'master' into Develop
# Conflicts: # cps.py # cps/web.py
Showing
This diff is collapsed.
... | ... | @@ -30,7 +30,6 @@ Flask-Dance>=2.0.0,<5.1.0 |
SQLAlchemy-Utils>=0.33.5,<0.38.0 | ||
# extracting metadata | ||
lxml>=3.8.0,<4.7.0 | ||
rarfile>=2.7 | ||
scholarly>=1.2.0, <1.3 | ||
... | ... |
Please
register
or
sign in
to comment