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

Merge remote-tracking branch 'origin/zero' into zero 

Conflicts:
	hardware/arduino/samd/cores/arduino/Arduino.h
	hardware/arduino/samd/variants/arduino_zero/variant.h
parents 275eff6a 618aa60a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment