Skip to content
Commit 73d41c10 authored by Denis Bakin's avatar Denis Bakin
Browse files

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

Conflicts:
	Marlin/language.h
	Marlin/thermistortables.h
parents 70871715 63da4dc5
Hide whitespace changes
Inline Side-by-side
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