Roland Geider 2d7c080a95 Merge branch 'master' into groups ...

# Conflicts:
#	docs/install.rst
#	requirements.txt
#	wger/core/apps.py
#	wger/core/templates/navigation.html
#	wger/gym/views/gym.py
#	wger/manager/api/views.py
#	wger/manager/apps.py
#	wger/manager/fixtures/test-workout-data.json
#	wger/manager/models.py
#	wger/manager/tests/test_workout.py
#	wger/manager/views/workout.py
#	wger/settings_global.py
#	wger/urls.py

2020-08-30 19:00:23 +02:00

..

filter-fixtures.py

Merge branch 'master' into groups

2020-08-30 19:00:23 +02:00