Skip to content
Snippets Groups Projects
Commit 2d661fc8 authored by Hangzhi Yu's avatar Hangzhi Yu
Browse files

Merge branch 'master' into '2-add-support-for-banks-on-fpga' 

# Conflicts:
#   fpga_device_manager/res/data/pins.json
parents 4b654f25 d448d62d
No related branches found
No related tags found
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