3 Commits (05a5144fa9032018b9aac3a5aaf9c368b8347a4f)

Author	SHA1	Message	Date
dependabot[bot]	05a5144fa9	build(deps): bump devmasx/merge-branch from 1.3.1 to 1.4.0 ... Bumps [devmasx/merge-branch](https://github.com/devmasx/merge-branch) from 1.3.1 to 1.4.0. - [Release notes](https://github.com/devmasx/merge-branch/releases) - [Changelog](https://github.com/devmasx/merge-branch/blob/master/CHANGELOG.md) - [Commits](https://github.com/devmasx/merge-branch/compare/v1.3.1...1.4.0) --- updated-dependencies: - dependency-name: devmasx/merge-branch dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	3 years ago
Malte Brandy	4acf281f00	.github/workflows/periodic-merge-*: Tiny improvements	3 years ago
Martin Weinelt	3f40ca48bc	.github/workflows/periodic-merge: generalize from merge-staging ... By generalizing the previous merge-staging action we can support a large number of branch pairs that need to be merged periodically. Provide two intervals, daily and every six hours, to accomodate different needs. Co-Authored-By: Malte Brandy <malte.brandy@maralorn.de>	3 years ago