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

# Conflicts:
#	code/src/Fitbot/app/src/main/java/com/example/fitbot/EndScreenActivity.java
#	code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java
#	code/src/Fitbot/app/src/main/res/layout/activity_fitness.xml

2024-05-22 11:03:11 +03:00

..

arduino

Merge branch '51-als-gebruiker-wil-ik-dat-pepper-mee-beweegt-tijdens-oefeningen-zodat-ik-meer-motivatie-heb-om'

2024-05-21 13:50:50 +02:00

server

Websocket server (stolen from last project)

2024-05-12 19:14:18 +02:00

src/Fitbot

Merge remote-tracking branch 'origin/main'

2024-05-22 11:03:11 +03:00

web

Added comment to incoming_request_handlers.js

2024-05-08 15:53:46 +02:00