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
Pipeline #4320 passed with stages
in 8 minutes and 5 seconds
Hide whitespace changes
Inline Side-by-side
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