Roland Geider bff492ef5e Merge branch 'master' into release/2.2 ...

# Conflicts:
#	.github/workflows/docker-base.yml
#	.github/workflows/docker-demo.yml
#	wger/__init__.py
#	wger/locale/fr/LC_MESSAGES/django.po

2023-12-05 15:04:21 +01:00

..

ci.yml

Fix typo

2023-11-02 09:02:07 +01:00

codeql-analysis.yml

Bump actions/checkout from 3 to 4

2023-09-04 23:04:37 +00:00

docker-base.yml

Merge branch 'master' into release/2.2

2023-12-05 15:04:21 +01:00

docker-demo.yml

Merge branch 'master' into release/2.2

2023-12-05 15:04:21 +01:00

docker.yml

Merge branch 'master' into release/2.2

2023-12-05 15:04:21 +01:00

formatter.yml

Bump actions/checkout from 3 to 4

2023-09-04 23:04:37 +00:00

linter.yml

Bump actions/checkout from 3 to 4

2023-09-04 23:04:37 +00:00

pypi-publish.yml

Bump actions/checkout from 3 to 4

2023-09-04 23:04:37 +00:00