Luca Warmenhoven ae52d10041 Merge remote-tracking branch 'origin/main' ...

# Conflicts:
#	code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java

2024-06-05 11:30:03 +02:00

..

arduino

Fix automatic ip adress esp

2024-06-04 14:40:06 +02:00

server

Refactor database query to fetch a specific exercise by ExerciseID

2024-06-04 12:31:29 +02:00

src/Fitbot

Merge remote-tracking branch 'origin/main'

2024-06-05 11:30:03 +02:00

web

Merge remote-tracking branch 'origin/main'

2024-06-03 14:04:03 +02:00