Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into 2.0.x
Browse files Browse the repository at this point in the history
  • Loading branch information
thinkyhead committed Aug 28, 2020
2 parents 96e29cd + 6ac8f5a commit b90e7c4
Show file tree
Hide file tree
Showing 454 changed files with 23,687 additions and 5,239 deletions.
4 changes: 4 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ We must be able to understand your proposed change from this description. If we

<!-- What does this fix or improve? -->

### Configurations

<!-- Attach any Configuration.h, Configuration_adv.h, or platformio.ini files needed to compile/test your Pull Request. -->

### Related Issues

<!-- Whether this fixes a bug or fulfills a feature request, please list any related Issues here. -->
3 changes: 2 additions & 1 deletion .github/workflows/test-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ jobs:
- BIGTREE_SKR_PRO
- BIGTREE_GTR_V1_0
- mks_robin
- mks_robin_stm32
- ARMED
- FYSETC_S6
- STM32F070RB_malyan
Expand All @@ -77,6 +78,7 @@ jobs:
- mks_robin_pro
- STM32F103RET6_creality
- LERDGEX
- mks_robin_nano35

# Put lengthy tests last

Expand All @@ -93,7 +95,6 @@ jobs:
#- at90usb1286_dfu
#- STM32F103CB_malyan
#- mks_robin_mini
#- mks_robin_nano

steps:

Expand Down
5 changes: 2 additions & 3 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007

Copyright (c) 2007 Free Software Foundation, Inc. <https://fsf.org/>
Copyright (c) 2007 Free Software Foundation, Inc. <https://www.fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.

Expand Down Expand Up @@ -673,5 +673,4 @@ into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<https://www.gnu.org/philosophy/why-not-lgpl.html>.

<https://www.gnu.org/licenses/why-not-lgpl.html>.
Loading

0 comments on commit b90e7c4

Please sign in to comment.