Self hosted FLOSS fitness/workout, nutrition and weight tracker
Merge branch 'django1.10'
Roland Geider04cc2486f1cb
diff --cc requirements.txtindex 863efb64b,9fefd334b..5b5d167ac--- a/requirements.txt+++ b/requirements.txt@@@ -2,14 -2,13 +2,13 @@@# Requirements for wger for production#- setuptools>=18.5-Django>=1.10,<1.11bleachdjango-bootstrap-breadcrumbsdjango-bower- django-formtools>=1.0,<1.1+ django-formtools>=2.0,<3.0django-recaptchadjango-sortedm2m- Django>=1.9,<1.10++Django>=1.10,<1.11django_compressordjango_mobileeasy-thumbnails@@@ -19,6 -18,6 +18,7 @@@ pillopython-mimeparsereportlab>=3.3,<3.4requests++setuptools>=18.5sphinx# REST API