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	Force "blank" issue template to end of list (#8387)	2020-03-12 01:27:33 -07:00
workflows	Rebase develop after a master push (#10812)	2020-11-21 11:48:13 -08:00
labeler.yml	Add additional auto labeler rules (#10704)	2020-10-24 01:29:17 +01:00
PULL_REQUEST_TEMPLATE.md	Add PR checklist document. (#9913)	2020-08-07 06:16:14 +10:00
stale.yml	Fix typos in stale.yml (#7489)	2019-11-26 21:45:18 +00:00