Zach White 8ddbb19df1 Rebase develop after a master push (#10812) ... * rebase develop after a master push * limit this to qmk/qmk_firmware * change to a merge strategy * GITHUB_TOKEN isn't needed * check for .locked in develop * break up into more steps		2020-11-21 11:48:13 -08:00
..
ISSUE_TEMPLATE
workflows	Rebase develop after a master push (#10812)	2020-11-21 11:48:13 -08:00
labeler.yml
PULL_REQUEST_TEMPLATE.md
stale.yml