Skip to content
Snippets Groups Projects
Commit 2daa8591 authored by Nicolas Rossi's avatar Nicolas Rossi
Browse files

Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin.git into Marlin_v1 

Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin_main.cpp
	Marlin/language.h
	Marlin/pins.h
	Marlin/ultralcd.cpp
parents aba67e24 2015989f
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 3227 additions and 267 deletions
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