Skip to content
Commit 7c428efa authored by ziggurat29's avatar ziggurat29
Browse files

Merge branch 'master' into stm32l4_usb 

Conflicts:
	configs/stm32l476vg-disco/nsh/defconfig
parents 6c762faa 2cadf783
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