mirror of
https://github.com/arduino/Arduino.git
synced 2025-03-13 10:29:35 +01:00
Merge branch 'platforms-arm' of https://github.com/arduino/ARM into platforms-arm
Conflicts: hardware/google/sam/boards.txt
This commit is contained in:
commit
29e2e30514