Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Js41637 committed Sep 19, 2024
2 parents 26a1fcb + acdde7b commit 309bb72
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions DataTool/Static/GUIDNames.csv
Original file line number Diff line number Diff line change
Expand Up @@ -703,6 +703,7 @@ F4A,09F,Menu/Ilios (Junker Queen),1
1249,09F,Menu/Lifeguard Art,1
124A,09F,Menu/Bound Demon,1
1276,09F,Menu/Juno Art,1
1293,09F,Menu/WoW Art,1
; Celebrations,,,
2168,01C,Christmas,1
2498,01C,LunarNewYear,1
Expand Down
2 changes: 1 addition & 1 deletion TACTLib
2 changes: 2 additions & 0 deletions TankLib/Overwatch.keyring
Original file line number Diff line number Diff line change
Expand Up @@ -235,3 +235,5 @@ FB019B3EC0836F37 77D29257630ADA7030CB0E7453A4F1FF 1 # [2.11.1] Transformers Coll
48BE810C52ACDFF8 E9872ADA0F3CE66ECEA60CD37D077E44 1 # [2.11.1] Bound Demon Mythic Weapon Skin
173C66BD14D96BF7 63E10DC4BCE1D3C4E34D88386D7F3886 1 # [2.11.1] Juno
05EBF9C79DE06CFA 16CD013283C60FC64CDF8C3636594821 1 # [2.12.0] Season 12
E6A1EFBE44A503EF 995829C4B50C051E94CCE310EACE0E4D 1 # [2.12.1] S12 Midseason
40810936FC2FFDC4 80EC3C9C214AD2508ED7D7F9B1B53AFA 1 # [2.12.1] S12 Midseason - WoW Collab

0 comments on commit 309bb72

Please sign in to comment.