Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Merge branch 'master' into fork/justin-pinheiro/pr-trophies

Roland Geiderc673caba7f54
diff --cc settings/settings_global.py
index 2414af271,90cc66030..18b8433ed
--- a/settings/settings_global.py
+++ b/settings/settings_global.py
@@@ -65,20 -71,13 +71,14 @@@ INSTALLED_APPS =
'wger.weight',
'wger.gallery',
'wger.measurements',
- # 'wger.trophies',
+ 'wger.trophies',
+
# reCaptcha support, see https://github.com/praekelt/django-recaptcha
'django_recaptcha',
-
# The sitemaps app
'django.contrib.sitemaps',
-
# thumbnails
'easy_thumbnails',
-
- # CSS/JS compressor
- 'compressor',
-
# Form renderer helper
'crispy_forms',
'crispy_bootstrap5',