]> git.atlas4tour.it Git - pia_atlas.git/commit
Merge remote-tracking branch 'origin/master'
authorValeria Vitti <valeria.vitti@dyrecta.com>
Tue, 15 Oct 2024 15:25:49 +0000 (17:25 +0200)
committerValeria Vitti <valeria.vitti@dyrecta.com>
Tue, 15 Oct 2024 15:25:49 +0000 (17:25 +0200)
commita7604f61c14fc01b20dc408e5a55e2b6961dd64f
tree090a2b36d9116c191aeb1955469304294226933d
parent3f456634a7ab387ce89bafed8cb88ae78aadcf39
parentfd123c42dcabcd04e1abf7b3db1ff5c715c35be4
Merge remote-tracking branch 'origin/master'

# Conflicts:
# requirements.txt
# sistema/templates/percorsi_cliente_home.html
# sistema/urls.py
# sistema/views.py
sistema/models.py
sistema/templates/base.html
sistema/templates/percorsi_cliente_home.html
sistema/urls.py
sistema/views.py