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

resolve and Merge branch 'master' into stm32l4_usb 

resolved Conflicts:
	configs/stm32l476vg-disco/nsh/defconfig
parents 5db2618c 26c91625
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