Skip to content
Commit 27f0580e authored by Ramon Nou's avatar Ramon Nou
Browse files

Merge branch 'main' into 'rnou/rootinstall_fixes' 

# Conflicts:
#   src/scord/rpc_server.cpp
parents 08da45c3 a666747a