Skip to content

Commit 309bb72

Browse files
committed
Merge branch 'develop'
2 parents 26a1fcb + acdde7b commit 309bb72

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

DataTool/Static/GUIDNames.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -703,6 +703,7 @@ F4A,09F,Menu/Ilios (Junker Queen),1
703703
1249,09F,Menu/Lifeguard Art,1
704704
124A,09F,Menu/Bound Demon,1
705705
1276,09F,Menu/Juno Art,1
706+
1293,09F,Menu/WoW Art,1
706707
; Celebrations,,,
707708
2168,01C,Christmas,1
708709
2498,01C,LunarNewYear,1

TankLib/Overwatch.keyring

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,3 +235,5 @@ FB019B3EC0836F37 77D29257630ADA7030CB0E7453A4F1FF 1 # [2.11.1] Transformers Coll
235235
48BE810C52ACDFF8 E9872ADA0F3CE66ECEA60CD37D077E44 1 # [2.11.1] Bound Demon Mythic Weapon Skin
236236
173C66BD14D96BF7 63E10DC4BCE1D3C4E34D88386D7F3886 1 # [2.11.1] Juno
237237
05EBF9C79DE06CFA 16CD013283C60FC64CDF8C3636594821 1 # [2.12.0] Season 12
238+
E6A1EFBE44A503EF 995829C4B50C051E94CCE310EACE0E4D 1 # [2.12.1] S12 Midseason
239+
40810936FC2FFDC4 80EC3C9C214AD2508ED7D7F9B1B53AFA 1 # [2.12.1] S12 Midseason - WoW Collab

0 commit comments

Comments
 (0)