Merge changes from master, PR #280 and resolve conflicts

This commit is contained in:
Khanh Ngo
2018-06-13 11:05:53 +07:00
918 changed files with 1236 additions and 226114 deletions

View File

@ -1,4 +1,5 @@
Flask==0.12.2
Flask-Assets==0.12
Flask-WTF==0.14.2
Flask-Login==0.4.1
Flask-OAuthlib==0.9.4
@ -17,3 +18,5 @@ gunicorn==19.7.1
python3-saml
pyOpenSSL>=0.15
pytz>=2017.3
cssmin==0.2.0
jsmin==2.2.2