Skip to content
Commit 741fa075 authored by Alessandro Lorenzetto's avatar Alessandro Lorenzetto
Browse files

Merge branch 'passing-to-socketio' into main

Conflicts:
	src/scripts/panel/pages/devices.html
	src/scripts/sandbox/socketio-server.py
	src/scripts/sandbox/templates/index.html
	src/scripts/templates/util/exception.py
	src/scripts/templates/util/functions.py
	src/scripts/web/pages/rtc_controls.html
	src/scripts/web/pages/sequencer.html
parents cf01c6d3 300713c4
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment