Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Merge branch 'django1.10'

Roland Geider04cc2486f1cb
diff --cc requirements.txt
index 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.11
bleach
django-bootstrap-breadcrumbs
django-bower
- django-formtools>=1.0,<1.1
+ django-formtools>=2.0,<3.0
django-recaptcha
django-sortedm2m
- Django>=1.9,<1.10
++Django>=1.10,<1.11
django_compressor
django_mobile
easy-thumbnails
@@@ -19,6 -18,6 +18,7 @@@ pillo
python-mimeparse
reportlab>=3.3,<3.4
requests
++setuptools>=18.5
sphinx
# REST API