Skip to content
This repository was archived by the owner on Aug 22, 2023. It is now read-only.

Merge master into net6 #5

Merged
merged 3 commits into from
Dec 17, 2021
Merged

Merge master into net6 #5

merged 3 commits into from
Dec 17, 2021

Conversation

sandyarmstrong
Copy link
Member

Ignore all upstream changes. The projects are cleaner in master but this way we don't have to change anything in VSMac. Can do another cleaning pass later.

This will allow a clean merge into master in #3.

@sandyarmstrong sandyarmstrong merged commit 9233d6a into net6 Dec 17, 2021
@Therzok Therzok deleted the dev/sandy/mergemain branch December 17, 2021 02:37
# for free to subscribe to this conversation on GitHub. Already have an account? #.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants