Skip to content
Snippets Groups Projects
Commit a526ee56 authored by Thibaut VIARD's avatar Thibaut VIARD
Browse files

Merge branch 'zero' of github.com:arduino/ArduinoZero into zero

Conflicts:
	hardware/arduino/samd/variants/arduino_zero/variant.cpp
parents 8109cf88 0f324768
No related branches found
No related tags found
No related merge requests found
Showing
with 545 additions and 306 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment