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

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

2024-05-15 16:44:07 +02:00

..

arduino

Repaired the websocket connector

2024-05-15 13:45:13 +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-15 16:44:07 +02:00

web

Added comment to incoming_request_handlers.js

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