Merge commit '8bd6b60a0141fa892984f2d5b61f06eadbbf9a5f' into look_at_201

This commit is contained in:
Scott Lahteine
2020-01-31 04:22:09 -06:00
748 changed files with 16647 additions and 696040 deletions

View File

@@ -1,9 +1,9 @@
# Marlin 3D Printer Firmware
# Marlin 3D Printer Firmware
[![Build Status](https://travis-ci.org/MarlinFirmware/Marlin.svg?branch=2.0.x)](https://travis-ci.org/MarlinFirmware/Marlin)
![GitHub](https://img.shields.io/github/license/marlinfirmware/marlin.svg)
![GitHub contributors](https://img.shields.io/github/contributors/marlinfirmware/marlin.svg)
![GitHub Release Date](https://img.shields.io/github/release-date/marlinfirmware/marlin.svg)
[![Build Status](https://github.com/MarlinFirmware/Marlin/workflows/CI/badge.svg?branch=bugfix-2.0.x)](https://github.com/MarlinFirmware/Marlin/actions)
<img align="right" width=175 src="buildroot/share/pixmaps/logo/marlin-250.png" />