5 Commits

Author	SHA1	Message	Date
Liam Fitzgerald	9ecc426820	meta: automatically merge master into ops/group-timer	2021-02-26 11:58:38 +10:00
Jared Tobin	67c57c98c5	meta: activate adjusted merge workflow	2021-01-14 15:56:57 +09:00
Jared Tobin	60f67727fe	meta: stage adjusted merge workflow ... Uses janeway-bot's token, rather than the default GitHub Actions token, to allow the merge workflow to trigger others.	2021-01-14 15:56:34 +09:00
Jared Tobin	169908a1a4	meta: add merge action	2021-01-06 20:25:44 +04:00
Jared Tobin	eae48b76c6	meta: stage a merge workflow ... Adds a workflow that, on any push to master, will merge master to release/next-js. Presently targeted at another branch for testing.	2021-01-06 20:25:44 +04:00