Skip to content
Commit 4f1b929f authored by adammydla's avatar adammydla
Browse files

Merge remote-tracking branch 'origin/sonic' into w/o_controller 

# Conflicts:
#	src/firmware/.settings/language.settings.xml
parents 5eee2303 4b4f4cbc
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