Changeset 4e49f94 in Launcher

Timestamp:
Feb 26, 2021 5:17:50 PM (3 years ago)
Author:
Jonathan Neufeld <support@…>
Branches:
feature/microsoft-oidc, master
Children:
f7f1869
Parents:
a793d82 (diff), daa955f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge remote-tracking branch 'vanilla/master' into feature/microsoft-oidc

# Conflicts:
# build.gradle
# creator-tools/src/main/java/com/skcraft/launcher/creator/controller/task/ProblemChecker.java
# creator-tools/src/main/java/com/skcraft/launcher/creator/server/PackagesHandler.java

(No files)

Note: See TracChangeset for help on using the changeset viewer.