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 |
|