Changeset 2d1b299 in Launcher

Timestamp:
May 30, 2021 5:52:30 PM (3 years ago)
Author:
Jonathan Neufeld <support@…>
Branches:
master
Parents:
3842c68 (diff), 5b742bc (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.
git-author:
Jonathan Neufeld <support@…> (05/30/21 17:50:44)
git-committer:
Jonathan Neufeld <support@…> (05/30/21 17:52:30)
Message:

Merge remote-tracking branch 'vanilla/master'

# Conflicts:
# launcher/src/main/resources/com/skcraft/launcher/launcher.properties

(No files)

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