Merge branch 'develop' of DFHack/dfhack into develop

develop
lethosor 2021-02-24 13:53:26 -05:00
commit b42da7e5d7
No known key found for this signature in database
GPG Key ID: 76A269552F4F58C1
3 changed files with 3 additions and 3 deletions

@ -24,7 +24,7 @@ jobs:
- name: Update submodules - name: Update submodules
run: | run: |
git config user.name "DFHack-Urist via GitHub Actions" git config user.name "DFHack-Urist via GitHub Actions"
git config user.email "DFHack-Urist@users.noreply.github.com" git config user.email "63161697+DFHack-Urist@users.noreply.github.com"
if bash -x ci/update-submodules.bash; then if bash -x ci/update-submodules.bash; then
git push --recurse-submodules=check git push --recurse-submodules=check
fi fi

@ -1 +1 @@
Subproject commit a589719047bcf2d85486a5ad8c28535480ffd5b7 Subproject commit fe29f3c1f5b43e9baae0a0a05a1d0d861fa96227

@ -1 +1 @@
Subproject commit 747cdb1ccb980c9dc3ff4d02b2c1500f7f2ddfc9 Subproject commit f4dfb0f28f6cb02fb673e599d150a545792ef86d