mas/.github
Ross Goldberg e9fcf2b254
Merge branch 'main' into upstream/releases/release-1.8.7
Signed-off-by: Ross Goldberg <484615+rgoldberg@users.noreply.github.com>

# Manual Merge Cleanup:
#	.actrc
#	.github/workflows/pr-checks.yml
#	.github/workflows/release.yml
#	Brewfile
#	script/test
#	script/version_bump

# Conflicts:
#	.github/workflows/build-test.yml
#	.gitignore
#	.swiftlint.yml
#	Brewfile.lock.json
#	Package.resolved
#	Sources/mas/Package.swift
#	Tests/masTests/.swiftlint.yml
#	script/bootstrap
#	script/build
#	script/format
#	script/lint
#	script/uninstall
#	script/version
2024-10-27 01:25:38 -04:00
..
ISSUE_TEMPLATE 🐛 Update branch in bug report template 2021-09-08 11:49:21 -07:00
workflows Merge branch 'main' into upstream/releases/release-1.8.7 2024-10-27 01:25:38 -04:00
CODEOWNERS 🔐 Add codeowners 2021-12-24 16:25:46 -07:00
dependabot.yml 🎨 Format YAML files 2024-02-18 14:05:02 -07:00
event.json 🤡 Add mock release event.json 2024-03-31 08:11:22 -06:00
release.yml 🎨 Format YAML files 2024-02-18 14:05:02 -07:00