Self hosted FLOSS fitness/workout, nutrition and weight tracker
Merge branch 'master' into pr-phase-3
Roland Geider0cfc9a5d011e
diff --cc requirements.txtindex 8b035ed82,c3d632600..c8202edec--- a/requirements.txt+++ b/requirements.txt@@@ -2,18 -2,17 +2,18 @@@# Requirements for wger for production#- bleach==3.1.0+ bleach==3.1.4-django-bootstrap-breadcrumbs==0.8.2+django-bootstrap-breadcrumbs==0.9.1django-bower==5.2.0django-formtools>=2.0,<3.0-django-recaptcha==1.2.1-django-sortedm2m==1.3.3-Django>=1.10,<1.11-django_compressor==2.1.1-django_mobile==0.7.0-easy-thumbnails==2.4.1-icalendar==3.11.3+django-recaptcha==2.0.4+Django>=1.11,<2.0+django_compressor==2.2+django_extensions>=2.1+django-sorted-m2m>=2.0+django-storages>=1.7+easy-thumbnails==2.6+icalendar==4.0.3invoke==0.17pillow==4.1.0python-mimeparse