From 514c997428989b177ee0d91b98e9ed5fed7bcd3e Mon Sep 17 00:00:00 2001
From: Nomentero_EPG <50520094+Nomenteros@users.noreply.github.com>
Date: Thu, 7 May 2020 23:49:34 +0200
Subject: [PATCH 1/2] Update Atreseries w3u (#602)

---
 TELEVISION.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TELEVISION.md b/TELEVISION.md
index d2cd27f2..3f6dae80 100644
--- a/TELEVISION.md
+++ b/TELEVISION.md
@@ -13,7 +13,7 @@
 | Neox | [m3u8 # GEO](https://livestartover-i.akamaized.net/geoneox/master.m3u8) - [m3u8](https://livestartover-i.akamaized.net/neox/master.m3u8) | [web](https://www.atresplayer.com/directos/neox/) | [logo](https://graph.facebook.com/neox/picture?width=320&height=320) | Neox.TDTChannelsEPG | - |
 | Nova | [m3u8 # GEO](https://livestartover-i.akamaized.net/geonova/master.m3u8) - [m3u8](https://livestartover-i.akamaized.net/nova/master.m3u8) | [web](https://www.atresplayer.com/directos/nova/) | [logo](https://graph.facebook.com/novatdt/picture?width=320&height=320) | Nova.TDTChannelsEPG | - |
 | Mega | [m3u8 # GEO](https://livestartover-i.akamaized.net/geomega/master.m3u8) - [m3u8](https://livestartover-i.akamaized.net/mega/master.m3u8) | [web](https://www.atresplayer.com/directos/mega/) | [logo](https://graph.facebook.com/megaTDT/picture?width=320&height=320) | Mega.TDTChannelsEPG | - |
-| Atreseries | [m3u8 # GEO](https://livestartover-i.akamaized.net/geoa3series/master.m3u8) - [m3u8](https://livestartover-i.akamaized.net/a3series/master.m3u8) | [web](https://www.atresplayer.com/directos/atreseries/) | [logo](https://graph.facebook.com/atreseries/picture?width=320&height=320) | Atreseries.TDTChannelsEPG | - |
+| Atreseries | - | [web](https://www.atresplayer.com/directos/atreseries/) | [logo](https://graph.facebook.com/atreseries/picture?width=320&height=320) | Atreseries.TDTChannelsEPG | W3U,WEMB |
 | FDF | [m3u8 # HD](https://mdslivehls-i.akamaihd.net/hls/live/571650/fdf/bitrate_4.m3u8) - [m3u8 # SD](https://mdslivehls-i.akamaihd.net/hls/live/571650/fdf/bitrate_2.m3u8) | [web](https://www.mitele.es/directo/fdf) | [logo](https://graph.facebook.com/factoriadeficcion/picture?width=320&height=320) | FDF.TDTChannelsEPG | NONAV,CODEC |
 | Energy | [m3u8 # HD](https://mdslivehlsb-i.akamaihd.net/hls/live/623617/energy/bitrate_4.m3u8) - [m3u8 # SD](https://mdslivehlsb-i.akamaihd.net/hls/live/623617/energy/bitrate_2.m3u8) | [web](https://www.mitele.es/directo/energy) | [logo](https://graph.facebook.com/E.EnergyTV/picture?width=320&height=320) | Energy.TDTChannelsEPG | NONAV,CODEC |
 | Divinity | [m3u8 # HD](https://mdslivehls-i.akamaihd.net/hls/live/571648/divinity/bitrate_4.m3u8) - [m3u8 # SD](https://mdslivehls-i.akamaihd.net/hls/live/571648/divinity/bitrate_2.m3u8) | [web](https://www.mitele.es/directo/divinity) | [logo](https://graph.facebook.com/divinityes/picture?width=320&height=320) | Divinity.TDTChannelsEPG | NONAV,CODEC |

From dbf85dcab19f7b7cdbe6ea9fab27537a94e62445 Mon Sep 17 00:00:00 2001
From: Berto9050 <63927009+Berto9050@users.noreply.github.com>
Date: Thu, 7 May 2020 23:50:50 +0200
Subject: [PATCH 2/2] =?UTF-8?q?Update=20RADIO.md=20-=20A=C3=B1adidas=20var?=
 =?UTF-8?q?ias=20emisoras=20(#597)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update RADIO.md (#1)

Añadidas radios online de CBN:  Classic Christian, Praise, Selah, Cross Country, Contemporary, Gospel, Southern Gospel, Superbook, Fiesta Hoy, CBN News, Christmas y Cross Country Christmas.

* Create canal-no-funciona.md

* Update canal-no-funciona.md

* Update a-adir-un-canal.md
---
 .github/ISSUE_TEMPLATE/a-adir-un-canal.md   |  8 ++++----
 .github/ISSUE_TEMPLATE/canal-no-funciona.md | 15 +++++++++++++++
 RADIO.md                                    | 12 ++++++++++++
 3 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 .github/ISSUE_TEMPLATE/canal-no-funciona.md

diff --git a/.github/ISSUE_TEMPLATE/a-adir-un-canal.md b/.github/ISSUE_TEMPLATE/a-adir-un-canal.md
index 544004b5..000975fa 100644
--- a/.github/ISSUE_TEMPLATE/a-adir-un-canal.md
+++ b/.github/ISSUE_TEMPLATE/a-adir-un-canal.md
@@ -7,9 +7,9 @@ assignees: ''
 
 ---
 
-**Indica la URL de la web de origen - REQUERIDO**
+<Indica debajo de esta linea la URL de la web de origen del canal><REQUERIDO>
 
-**Indica la URL de la web de la emisión - REQUERIDO**
+<Indica debajo de esta linea la URL de la emision><REQUERIDO>
 
-**Información extra**
-Indica aquí cualquier otra información relativa a esta propuesta.
+
+<Indica debajo de esta linea cualquier otra informacion relativa a esta propuesta>
diff --git a/.github/ISSUE_TEMPLATE/canal-no-funciona.md b/.github/ISSUE_TEMPLATE/canal-no-funciona.md
new file mode 100644
index 00000000..c90d247a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/canal-no-funciona.md
@@ -0,0 +1,15 @@
+---
+name: Canal no funciona
+about: Si deseas informar sobre un canal que no funcione o si tienes sus datos actualizados
+title: 'Canal no funciona: NOMBRE'
+labels: canal-no-funciona
+assignees: ''
+
+---
+
+<En caso de saberlo indica debajo de esta linea la URL de la web de origen del canal><REQUERIDO>
+
+<En caso de saberlo indica debajo de esta linea la URL de la emision><REQUERIDO>
+
+
+<Indica debajo de esta linea cualquier otra informacion relativa a esta propuesta>
diff --git a/RADIO.md b/RADIO.md
index 831bbfcc..1926e347 100644
--- a/RADIO.md
+++ b/RADIO.md
@@ -838,3 +838,15 @@
 | BFBS Gibraltar 1 | [mp3](https://edge-audio-02-gos1.sharp-stream.com/ssvcbfbs7.aac) | [web](https://radio.bfbs.com/stations/bfbs-gibraltar) | [logo](https://graph.facebook.com/BFBSRadio/picture?width=320&height=320) | - | - |
 | BFBS Gibraltar 2 | [mp3](https://edge-audio-03-gos2.sharp-stream.com/ssvcbfbs2.aac) | [web](https://radio.bfbs.com/stations/bfbs-gibraltar) | [logo](https://graph.facebook.com/BFBSRadio/picture?width=320&height=320) | - | - |
 | Radio Swiss Jazz | [stream](http://stream.srg-ssr.ch/m/rsj/mp3_128) | [web](http://www.radioswissjazz.ch/en) | [logo](http://www.radioswissjazz.ch/assets/logos-claim/rsj-logo-claim-desktop-743c15e642e0ed09bb7fa1bbbd72f2d1.png) | - | - |
+| CBN Classic Christian | [stream](https://streams.cbnradio.com/Classic-Christian-128K) | [web](https://www1.cbn.com/sites/all/libraries/radio/radio_player.php?station=classicchristian&mode=expanded) | [logo](https://www1.cbn.com/sites/all/libraries/radio/img/classic300x300.jpg) | - | - |
+| CBN Praise | [stream](https://streams.cbnradio.com/praise-128K) | [web](https://www1.cbn.com/sites/all/libraries/radio/radio_player.php?station=praise&mode=expanded) | [logo](https://www1.cbn.com/sites/all/libraries/radio/img/praise300x300.jpg) | - | - |
+| CBN Selah | [stream](https://streams.cbnradio.com/instrumental-128K) | [web](https://www1.cbn.com/sites/all/libraries/radio/radio_player.php?station=selah&mode=expanded) | [logo](https://www1.cbn.com/sites/all/libraries/radio/img/selah300x300.jpg) | - | - |
+| CBN Cross Country | [stream](https://streams.cbnradio.com/country-128K) | [web](https://www1.cbn.com/sites/all/libraries/radio/radio_player.php?station=crosscountry&mode=expanded) | [logo](https://www1.cbn.com/sites/all/libraries/radio/img/cross-country300x300.jpg) | - | - |
+| CBN Contemporary | [stream](https://streams.cbnradio.com/contemporary-128K) | [web](https://www1.cbn.com/sites/all/libraries/radio/radio_player.php?station=contemporary&mode=expanded) | [logo](https://www1.cbn.com/sites/all/libraries/radio/img/contemporary300x300.jpg) | - | - |
+| CBN Gospel | [stream](https://streams.cbnradio.com/gospel-128K) | [web](https://www1.cbn.com/sites/all/libraries/radio/radio_player.php?station=gospel&mode=expanded) | [logo](https://www1.cbn.com/sites/all/libraries/radio/img/gospel300x300.jpg) | - | - |
+| CBN Southern Gospel | [stream](https://streams.cbnradio.com/southern-gospel-128K) | [web](https://www1.cbn.com/sites/all/libraries/radio/radio_player.php?station=southerngospel&mode=expanded) | [logo](https://www1.cbn.com/sites/all/libraries/radio/img/southern-gospel300x300.jpg) | - | - |
+| CBN Superbook | [stream](https://streams.cbnradio.com/superbook-128K) | [web](https://www1.cbn.com/sites/all/libraries/radio/radio_player.php?station=superbook&mode=expanded) | [logo](https://www1.cbn.com/sites/all/libraries/radio/img/superbook300x300.jpg) | - | - |
+| CBN Fiesta Hoy | [stream](https://streams.cbnradio.com/fiesta-hoy-128K) | [web](https://www1.cbn.com/sites/all/libraries/radio/radio_player.php?station=fiestahoy&mode=expanded) | [logo](https://www1.cbn.com/sites/all/libraries/radio/img/fiestahoy300x300.jpg) | - | - |
+| CBN News | [stream](https://streams.cbnradio.com/news-128K) | [web](https://www1.cbn.com/sites/all/libraries/radio/radio_player.php?station=cbnnews&mode=expanded) | [logo](https://www1.cbn.com/sites/all/libraries/radio/img/news300x300.jpg) | - | - |
+| CBN Christmas | [stream](https://streams.cbnradio.com/christmas-128K) | [web](https://www1.cbn.com/sites/all/libraries/radio/radio_player.php?station=christmas&mode=expanded) | [logo](https://www1.cbn.com/sites/all/libraries/radio/img/christmas300x300.jpg) | - | - |
+| CBN Cross Country Christmas | [stream](https://streams.cbnradio.com/country-christmas-128K) | [web](https://www1.cbn.com/sites/all/libraries/radio/radio_player.php?station=crosscountrychristmas&mode=expanded) | [logo](https://www1.cbn.com/sites/all/libraries/radio/img/cross-countrychristmas300x300.jpg) | - | - |