Skip to content

🔀 Merge 1.7.1 hotfix into master#303

Merged
phatblat merged 29 commits intomasterfrom
v1.7-rebase
Sep 7, 2020
Merged

🔀 Merge 1.7.1 hotfix into master#303
phatblat merged 29 commits intomasterfrom
v1.7-rebase

Conversation

@phatblat
Copy link
Member

@phatblat phatblat commented Sep 7, 2020

Brings #299 #300 and #301 into the mainline.

Obviates #302

# Conflicts:
#	MasKitTests/Formatters/AppListFormatterSpec.swift
# Conflicts:
#	CHANGELOG.md
# Conflicts:
#	Brewfile.lock.json
No longer needed as of Quick 3
# Conflicts:
#	CHANGELOG.md
# Conflicts:
#	Homebrew/mas.rb
# Conflicts:
#	.editorconfig
@masclibot
Copy link

1 Warning
⚠️ 😵 Big PR

Generated by 🚫 Danger

@phatblat phatblat marked this pull request as ready for review September 7, 2020 18:24
@phatblat phatblat merged commit 94eb4e5 into master Sep 7, 2020
@phatblat phatblat deleted the v1.7-rebase branch September 7, 2020 18:31
@phatblat phatblat added this to the 1.8 milestone Feb 13, 2021
@rgoldberg rgoldberg added the 🧽 chore Administrative task: documentation, build, test, release, git, etc. label May 15, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

🧽 chore Administrative task: documentation, build, test, release, git, etc.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants