Skip to content

Commit 3f7b94f

Browse files
cmagliecmaglie
committed
Merge branch 'ide-1.5.x-thirdpartyboardprofiles' of github.com:projectgus/Arduino into projectgus-ide-1.5.x-thirdpartyboardprofiles
Conflicts: app/src/processing/app/debug/BasicUploader.java
2 parents 8c42d45 + 96c292c commit 3f7b94f

File tree

0 file changed

+0
-0
lines changed

    0 file changed

    +0
    -0
    lines changed

    0 commit comments

    Comments
     (0)