Roland Geider 2247a7c071 Merge branch 'refs/heads/master' into fix/configuration ...

# Conflicts:
#	extras/docker/development/settings.py
#	wger/nutrition/api/views.py
#	wger/nutrition/models/ingredient.py
#	wger/settings_global.py

2024-06-18 17:28:48 +02:00

..

base

Replace further appearances of twitter with mastodon

2023-11-26 14:06:26 +01:00

demo

Use hatchling as the build backend, this seems to make less problems

2024-01-27 11:48:15 +01:00

development

Merge branch 'refs/heads/master' into fix/configuration

2024-06-18 17:28:48 +02:00