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
..
api.yml	…
cli.yml	…
develop_update.yml	Rebase develop after a master push (#10812)	2020-11-21 11:48:13 -08:00
docs.yml	CI: Add docs build and deploy workflow (#7448)	2020-11-10 07:00:40 -08:00
labeler.yml	…
lint.yml	Improve the QMK Lint workflow (#10909)	2020-11-10 15:21:59 +00:00