Self hosted FLOSS fitness/workout, nutrition and weight tracker
Merge branch 'master' into cache-exercise-responses
Tom Bowyer7a6076b1a6f3
diff --cc wger/settings_global.pyindex 046efbdf6,ae56e77ca..71a33bf42--- a/wger/settings_global.py+++ b/wger/settings_global.py@@@ -424,12 -424,10 +424,11 @@@ USER_AGENTS_CACHE = 'default# Consult docs/settings.rst for more information#WGER_SETTINGS = {- 'USE_RECAPTCHA': False,- 'ALLOW_REGISTRATION': True,'ALLOW_GUEST_USERS': True,+ 'ALLOW_REGISTRATION': True,'ALLOW_UPLOAD_VIDEOS': False,'EMAIL_FROM': 'wger Workout Manager <[email protected]>',- 'TWITTER': False+ 'EXERCISE_CACHE_TTL': 3600,- 'REMOVE_WHITESPACE': False,+ 'TWITTER': False,+ 'USE_RECAPTCHA': False}