matteo porta
|
9986e35310
|
Merge remote-tracking branch 'origin/master'
|
2022-06-21 14:18:06 +02:00 |
|
matteo porta
|
ca947434f8
|
vision wip
|
2022-06-21 14:10:52 +02:00 |
|
ST-TEN-1
|
f99891cf25
|
Merge branch 'master' of https://gitlab.com/neosystems/errecinque/mappano/st-ten-1
# Conflicts:
# config/machine_settings/defaults.ini
# init.sh
# simulate.sh
# src/components/__init__.py
# src/components/component.py
# src/lib/db/__init__.py
# src/lib/db/models/recipes.py
# src/main.py
# src/requirements.txt
# src/ui/__init__.py
# src/ui/crud/crud.py
# src/ui/dialog/dialog.py
# src/ui/login/login.py
# src/ui/recipe_selection/recipe_selection.py
|
2022-06-20 16:08:02 +02:00 |
|
ST-TEN-1
|
c7f2bf8764
|
dev
|
2022-06-20 09:08:34 +02:00 |
|
matteo porta
|
e309021671
|
?tecna?
|
2022-06-08 16:46:47 +02:00 |
|
matteo porta
|
0beb139753
|
init
|
2022-06-01 18:37:27 +02:00 |
|
ST-TEN-1
|
9496e78584
|
dev
|
2022-05-31 17:07:10 +02:00 |
|
matteo porta
|
5367cfaa1c
|
wip
|
2022-05-25 17:28:17 +02:00 |
|
matteo porta
|
825b87bf80
|
init
|
2022-05-25 15:05:23 +02:00 |
|