Skip to content
Commit d2abc684 authored by daid's avatar daid
Browse files

Merge branch 'Marlin_UM_HeatedBedUpgrade' into Marlin_UM_Original_Plus 

Conflicts:
	Marlin/Configuration.h
parents 02093bca 89269b7e
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