Self hosted FLOSS fitness/workout, nutrition and weight tracker
Merge branch 'master'
Roland Geider06e5ba32ca8f
diff --cc requirements.txtindex f2a7fd155,2965d8834..9fefd334b--- a/requirements.txt+++ b/requirements.txt@@@ -2,29 -2,29 +2,29 @@@# Requirements for wger for production#+Django>=1.10,<1.11+ bleach+ django-bootstrap-breadcrumbs+ django-bower-django-formtools>=1.0,<1.1++django-formtools>=2.0,<3.0django-recaptcha- reportlab+ django-sortedm2m-Django>=1.9,<1.10+ django_compressordjango_mobile- django-formtools>=2.0,<3.0- bleach- python-mimeparse- pilloweasy-thumbnails- django_compressoricalendar- django-bootstrap-breadcrumbs- sphinx- django-sortedm2m- django-bower- invoke+ invoke>=0.14,<0.15+ pillow+ python-mimeparse+ reportlab>=3.3,<3.4requests+ sphinx# REST API- djangorestframework>=3.4,<3.5- django-filter- django-tastypiedjango-cors-headers+ django-filter+ django-tastypie>=0.13,<0.14-djangorestframework>=3.2,<3.3++djangorestframework>=3.4,<3.5# Python3 compatibilitysix