Merge remote-tracking branch 'oauth/oauth' into Develop
# Conflicts: # cps/templates/config_edit.html # cps/ub.py # cps/web.py
Showing
cps/oauth.py
0 → 100644
This diff is collapsed.
... | @@ -13,3 +13,5 @@ SQLAlchemy>=1.1.0 | ... | @@ -13,3 +13,5 @@ SQLAlchemy>=1.1.0 |
tornado>=4.1 | tornado>=4.1 | ||
Wand>=0.4.4 | Wand>=0.4.4 | ||
unidecode>=0.04.19 | unidecode>=0.04.19 | ||
flask-dance>=0.13.0 | |||
sqlalchemy_utils>=0.33.5 |
Please
register
or
sign in
to comment