[60] Merge remote-tracking branch 'Arial-Z/add-studio-Stöð-2' into nightly

11 months ago · 95b5efbd51
parent cfe11ec256 c83fb67394
commit 95b5efbd51
19 changed files with 5 additions and 0 deletions
--- a/defaults/both/studio.yml
+++ b/defaults/both/studio.yml
@ -449,6 +449,7 @@ dynamic_collections:
      - Sony Pictures
      - Sphère Média Plus
      - Spyglass Entertainment
      - Stöð 2
      - Star Thrower Entertainment
      - Stark Raving Black Productions
      - StudioCanal
--- a/defaults/overlays/images/cr/de0.png
+++ b/defaults/overlays/images/cr/de0.png
--- a/defaults/overlays/images/cr/de0c.png
+++ b/defaults/overlays/images/cr/de0c.png
--- a/defaults/overlays/images/cr/de12.png
+++ b/defaults/overlays/images/cr/de12.png
--- a/defaults/overlays/images/cr/de12c.png
+++ b/defaults/overlays/images/cr/de12c.png
--- a/defaults/overlays/images/cr/de16.png
+++ b/defaults/overlays/images/cr/de16.png
--- a/defaults/overlays/images/cr/de16c.png
+++ b/defaults/overlays/images/cr/de16c.png
--- a/defaults/overlays/images/cr/de18.png
+++ b/defaults/overlays/images/cr/de18.png
--- a/defaults/overlays/images/cr/de18c.png
+++ b/defaults/overlays/images/cr/de18c.png
--- a/defaults/overlays/images/cr/de6.png
+++ b/defaults/overlays/images/cr/de6.png
--- a/defaults/overlays/images/cr/de6c.png
+++ b/defaults/overlays/images/cr/de6c.png
--- a/defaults/overlays/images/cr/debpjm.png
+++ b/defaults/overlays/images/cr/debpjm.png
--- a/defaults/overlays/images/cr/debpjmc.png
+++ b/defaults/overlays/images/cr/debpjmc.png
--- a/defaults/overlays/images/cr/denr.png
+++ b/defaults/overlays/images/cr/denr.png
--- a/defaults/overlays/images/cr/denrc.png
+++ b/defaults/overlays/images/cr/denrc.png
--- a/defaults/overlays/images/studio/bigger/Stöð
+++ b/defaults/overlays/images/studio/bigger/Stöð
--- a/defaults/overlays/images/studio/standard/Stöð
+++ b/defaults/overlays/images/studio/standard/Stöð
--- a/defaults/overlays/studio.yml
+++ b/defaults/overlays/studio.yml
@ -1291,6 +1291,9 @@ overlays:
  Spyglass Entertainment:
    template: [name: standard, name: studios]
  Stöð 2:
    template: [name: standard, name: studios]
  Star Thrower Entertainment:
    template: [name: standard, name: studios]
--- a/docs/defaults/both/studio.md
+++ b/docs/defaults/both/studio.md
@ -505,6 +505,7 @@ include:
  - Sony Pictures
  - Sphère Média Plus
  - Spyglass Entertainment
  - Stöð 2
  - Star Thrower Entertainment
  - Stark Raving Black Productions
  - StudioCanal