Merge branch 'pr/n2052_patch-3' into nightly

# Conflicts:
#	defaults/show/franchise.yml
pull/2056/head
Yozora XCII 6 months ago
commit 294df65083

@ -64,6 +64,7 @@ dynamic_collections:
"253": Star Trek "253": Star Trek
"549": Law & Order "549": Law & Order
"951": Archie Comics "951": Archie Comics
"1399": Game of Thrones
"1402": The Walking Dead "1402": The Walking Dead
"1412": Arrowverse "1412": Arrowverse
"1431": CSI "1431": CSI
@ -87,6 +88,7 @@ dynamic_collections:
253: [655, 580, 1855, 1992, 314, 103516, 67198, 82491, 85948, 85949, 106393] # TOS, TAS, TNG, DS9, VOY, ENT, DIS, SHO, PIC, LOW, PRO, SNW 253: [655, 580, 1855, 1992, 314, 103516, 67198, 82491, 85948, 85949, 106393] # TOS, TAS, TNG, DS9, VOY, ENT, DIS, SHO, PIC, LOW, PRO, SNW
549: [2734, 4601, 3357, 32632, 72496, 106158] # Law & Order: Special Victims Unit, Criminal Intent, Trial by Jury, LA, True Crime, Organized Crime 549: [2734, 4601, 3357, 32632, 72496, 106158] # Law & Order: Special Victims Unit, Criminal Intent, Trial by Jury, LA, True Crime, Organized Crime
951: [25641, 4489, 24211, 9829, 605, 69050, 79242, 87539] # The Archie Show, Sabrina, The Teenage Witch, Josie and the Pussycats, Josie and the Pussycats in Outer Space, The New Archies, Riverdale, Chilling Adventures of Sabrina, Katy Keene 951: [25641, 4489, 24211, 9829, 605, 69050, 79242, 87539] # The Archie Show, Sabrina, The Teenage Witch, Josie and the Pussycats, Josie and the Pussycats in Outer Space, The New Archies, Riverdale, Chilling Adventures of Sabrina, Katy Keene
1399: [94997] # Game of Thrones, House of the Dragon
1402: [62286, 94305, 194583, 211684, 206586] # The Walking Dead: Fear the Walking Dead, World Beyond, Dead City, Daryl Dixon, The Ones Who Live 1402: [62286, 94305, 194583, 211684, 206586] # The Walking Dead: Fear the Walking Dead, World Beyond, Dead City, Daryl Dixon, The Ones Who Live
1412: [60735, 62688, 62643, 71663, 89247] # Arrow: The Flash, Supergirl, Legends of Tomorrow, Black Lightning, Batwoman 1412: [60735, 62688, 62643, 71663, 89247] # Arrow: The Flash, Supergirl, Legends of Tomorrow, Black Lightning, Batwoman
1431: [1620, 2458, 122194, 61811] # CSI: Miami, NY, Vegas, Cyber 1431: [1620, 2458, 122194, 61811] # CSI: Miami, NY, Vegas, Cyber

Loading…
Cancel
Save