Merge branch 'develop' of https://github.com/HarbourMasters/Shipwright into rando-custom-messages

This commit is contained in:
Christopher Leggett 2022-07-15 19:18:45 -04:00
commit 1165e70434
No known key found for this signature in database
GPG Key ID: 7093AE5FF7037D79

View File

@ -6,7 +6,7 @@
[subrepo] [subrepo]
remote = https://github.com/HarbourMasters/soh.git remote = https://github.com/HarbourMasters/soh.git
branch = master branch = master
commit = ba904bbd0d724784f8f37ff4bea378f6fe26151b commit = 75ccbade8ba26485266a8c8aa7d81e495d0ca4dd
parent = 0bb0e7b53bd80bdc7f78e08c441691737e039b2b parent = 8417db65c73cb3d117f2a0f9040105022a45480c
method = rebase method = rebase
cmdver = 0.4.1 cmdver = 0.4.1