Commit Graph

1928 Commits (fd208360b4d519514e55b5e27fd8f2eb54bd7f81)

Author SHA1 Message Date
Aleksandr Statciuk 2b919b55c5
Merge branch 'master' into BountyChocolate123456-patch-2
baptiste313 99a63ae6d1
Update fr.m3u
baptiste313 901a1a0ecb
Update fr.m3u
BountyChocolate123456 aa479d7acf
Merge branch 'master' into BountyChocolate123456-patch-2
BountyChocolate123456 707d0df329
Merge branch 'master' into BountyChocolate123456-patch-1
MapGuy11 128fd12a31
Merge branch 'master' into BountyChocolate123456-patch-5
iptv-bot[bot] c215c41cc0
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
BountyChocolate123456 dcb73a4dcc
Merge branch 'master' into BountyChocolate123456-patch-4
Aleksandr Statciuk 597811b8a5
Merge branch 'master' into BountyChocolate123456-patch-6
BountyChocolate123456 dbb3879c0b
Remove broken streams
BountyChocolate123456 9c848e538a
Merge branch 'master' into BountyChocolate123456-patch-1
BountyChocolate123456 751a8dbba8
Merge branch 'master' into BountyChocolate123456-patch-2
BountyChocolate123456 657c63a72f
Merge branch 'master' into BountyChocolate123456-patch-3
BountyChocolate123456 2f173a5149
Merge branch 'master' into BountyChocolate123456-patch-4
BountyChocolate123456 d1f952d48a
Merge branch 'master' into BountyChocolate123456-patch-6
BountyChocolate123456 618ed6d379
Merge branch 'master' into energeek-patch
baptiste313 b8955b143a
Update fr.m3u
F640 e8c488b854
Update id.m3u
F640 708f18a003
Removed Hi Indo!
F640 0cf066f2b1
Update pa.m3u
iptv-bot[bot] e32a18be17
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
F640 f0a2d5b60e
Update id.m3u
F640 23093be7e7
Update vn_fptplay.m3u
F640 9d30b04fc3
Update jp.m3u
F640 8f476198b9
Update id.m3u
Central302 5ea556775f
Merge branch 'master' into ClassicArtsShowcase-patch
BountyChocolate123456 42baad9184
Update us_samsung.m3u
BountyChocolate123456 bb986c2b06
Update us_samsung.m3u
BountyChocolate123456 bc7a20d3c2
Merge branch 'master' into BountyChocolate123456-patch-2
BountyChocolate123456 3cf5df7045
Merge branch 'master' into BountyChocolate123456-patch-4
Diego 7366890620
Update cl.m3u
Edit Energeek
LaneSh4d0w 99cb3a5ec5
Merge branch 'master' into BountyChocolate123456-patch-5
Diego f75f00ab50
Update us.m3u
Add Classic Arts Showcase
LaneSh4d0w 04025965ca
Update jp.m3u
LaneSh4d0w cc4ff4ab2c
JP : HD resolution + more channels
LaneSh4d0w fc2cca9b5a
Merge branch 'master' into patch-3
LaneSh4d0w e902839095
Merge branch 'master' into BountyChocolate123456-patch-4
MapGuy11 e200264c05
Merge branch 'master' into BountyChocolate123456-patch-5
iptv-bot[bot] 27cc646fc7
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
BountyChocolate123456 77afd73241
Update tr.m3u
BountyChocolate123456 ff608fdc6f
Add NASA TV UHD
BountyChocolate123456 10ec7f2fa6
Fix France 24
BountyChocolate123456 15d6d131bc
Fix BloombergTVPlus.us in it_samsung.m3u
BountyChocolate123456 5c942a95ba
Update us_samsung.m3u
BountyChocolate123456 91daaf1db4
Update us_samsung.m3u
BountyChocolate123456 ccf662fa7d
Update uk_samsung.m3u
BountyChocolate123456 a0aa801679
Merge branch 'master' into patch-3
iptv-bot[bot] 9e88384817
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
LaneSh4d0w 4d5d6f34cc
Merge branch 'master' into LaneSh4d0w-patch-5
LaneSh4d0w 88f52a8b28
Merge branch 'master' into LaneSh4d0w-patch-5
LaneSh4d0w cd1c396d65
Merge branch 'master' into Central302-patch-1
Aleksandr Statciuk 3848891bd2
Merge branch 'master' into LaneSh4d0w-patch-7
Aleksandr Statciuk 1cc918c9ea
Merge branch 'master' into LaneSh4d0w-patch-3
iptv-bot[bot] ec0a432d47
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
Central302 0dc08de559
Update jp.m3u
LaneSh4d0w 58958e8719
Merge branch 'master' into LaneSh4d0w-patch-1
iptv-bot[bot] d9b5b25204
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
Aleksandr Statciuk 7b3cef3989 Fixes validation errors
Aleksandr Statciuk 407cdd8402 Fixes validation errors
LaneSh4d0w 169fed3802
Merge branch 'master' into LaneSh4d0w-patch-5
LaneSh4d0w 4203ae4ac3
Merge branch 'master' into LaneSh4d0w-patch-6
LaneSh4d0w 556cd2ec91
Merge branch 'master' into patch-3
LaneSh4d0w 97a18633c0
Merge branch 'master' into LaneSh4d0w-patch-6
LaneSh4d0w a3fe50a61b
Merge branch 'master' into LaneSh4d0w-patch-4
iptv-bot[bot] 354b641a37
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
LaneSh4d0w ac16ab9756
add A3Cine
LaneSh4d0w 33d55f0002
Update jp.m3u
LaneSh4d0w 5d224c743a
Merge branch 'master' into LaneSh4d0w-patch-1
LaneSh4d0w 769e7a2255
Merge branch 'master' into LaneSh4d0w-patch-6
LaneSh4d0w c3a841e1ce
Merge branch 'master' into LaneSh4d0w-patch-4
LaneSh4d0w c0127be8a9
Merge branch 'master' into patch-1
LaneSh4d0w 5bac69c56a
add more
LaneSh4d0w a1e2a3fb71
Update kr.m3u
LaneSh4d0w 5934223c34
JP : Add NHK AI-Translated channels + NHKP
LaneSh4d0w 0d8dd2b0c6
Merge branch 'master' into LaneSh4d0w-patch-6
LaneSh4d0w a629fbd85a
Merge branch 'master' into patch-1
LaneSh4d0w 7620d2d1df
Update us.m3u
Allan Fernando 7d90bbf35b
Update kr.m3u
Allan Fernando d2b3226803 Add more channels
Allan Fernando db0ef9726f Add more channels
Allan Fernando cba82f7feb Fix merge
Allan Fernando a8fd9f54f2 Merge remote-tracking branch 'iptv-org/master' into kr
# Conflicts:
#	streams/kr.m3u
Allan Fernando 38d5badc0a Fix KR channels
Allan Fernando 56ddf2685f Fix KR channels
iptv-bot[bot] ec85afd256
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
LaneSh4d0w 90a6d4f6a1
Merge branch 'master' into LaneSh4d0w-patch-3
LaneSh4d0w fed3441eaa
Merge branch 'master' into BountyChocolate123456-patch-1
LaneSh4d0w 773d4519cc
Merge branch 'master' into LaneSh4d0w-patch-4
LaneSh4d0w f87f9a29ca
Update co.m3u
LaneSh4d0w 120c61709a
Merge branch 'master' into BountyChocolate123456-patch-3
LaneSh4d0w f6735ee813
Merge branch 'master' into BountyChocolate123456-patch-3
LaneSh4d0w 4d54f28c66
Merge branch 'master' into BountyChocolate123456-patch-2
LaneSh4d0w a041ab37f1
Merge branch 'master' into LaneSh4d0w-patch-5
LaneSh4d0w d5fbda16c9
Merge branch 'master' into patch-1
Aleksandr Statciuk 7db74c4f97
Merge branch 'master' into BountyChocolate123456-patch-2
LaneSh4d0w 9872ebe558
Merge branch 'master' into BountyChocolate123456-patch-hiplayer
LaneSh4d0w 50cf9757ff
Merge branch 'master' into BountyChocolate123456-patch-hiplayer
Aleksandr Statciuk d109e1f80f
Merge branch 'master' into BountyChocolate123456-patch-4
Aleksandr Statciuk 92e70d3e55
Merge branch 'master' into BountyChocolate123456-patch-5
LaneSh4d0w c461f30c81
Merge branch 'master' into LaneSh4d0w-patch-6
LaneSh4d0w 00cb9f93c9
Merge branch 'master' into LaneSh4d0w-patch-6
LaneSh4d0w 97b5495cc7
Merge branch 'master' into master
iptv-bot[bot] f07f8721ac
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
LaneSh4d0w d8bfe19c00
Merge branch 'master' into LaneSh4d0w-patch-4
iptv-bot[bot] 5e9b64aad7
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
LaneSh4d0w ba1f8ac8ce
Update co.m3u
LaneSh4d0w 8098f5eaa5
Update co.m3u
LaneSh4d0w ef7a48412e
Update co.m3u
LaneSh4d0w d0cb4fca7a
Update co.m3u
LaneSh4d0w a36039dccf
Update co.m3u
LaneSh4d0w 1ef8059d72
Update co.m3u
LaneSh4d0w f335ef6f72
Merge branch 'master' into LaneSh4d0w-patch-4
LaneSh4d0w c9f73758d0
Update co.m3u
LaneSh4d0w 2a29e80c1b
Update co.m3u
Allan Fernando 0cd4ae5c0d
Merge branch 'master' into master
LaneSh4d0w f9518de28b
Merge branch 'master' into LaneSh4d0w-patch-6
iptv-bot[bot] 234a2c7ed4
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
LaneSh4d0w d48f37d505
Update gr.m3u
Allan Fernando 4550804749
Update kr.m3u
Allan Fernando cdcad9253e
Merge branch 'master' into master
iptv-bot[bot] 5bc15c4056
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
Allan Fernando 53205589e4
Merge branch 'master' into master
BountyChocolate123456 88edc686dd
Merge branch 'master' into BountyChocolate123456-patch-hiplayer
LaneSh4d0w 067f19afe5
Merge branch 'master' into patch-1
Allan Fernando 1394880595
Update kr.m3u
LaneSh4d0w ee43f521f9
Update kr.m3u
Allan Fernando 0e46904afe
Update kr.m3u
BountyChocolate123456 23454949ac
Update sa.m3u
LaneSh4d0w afdbe478f6
Add Invivo channels
https://invivo.tv/ / https://www.lyngsat.com/tvchannels/uk/XY-Plus.html
BountyChocolate123456 34794d1782
Update sa.m3u
LaneSh4d0w 50f2c85c15
add radio variants as well.
BountyChocolate123456 a761f0df74
Update kw.m3u
BountyChocolate123456 52f522a6aa
Update kw.m3u
BountyChocolate123456 f478029204
Update ae.m3u
BountyChocolate123456 8528f491e3
Update kw.m3u
BountyChocolate123456 b29d3745ae
Update sa.m3u
Allan Fernando 221b5a8a29
Update kr.m3u
BountyChocolate123456 88ea357d10
Update uk.m3u
Allan Fernando 0efb2a85a5
Update kr.m3u
BountyChocolate123456 e805f23f72
Update MTA
Allan Fernando fa324523ba
Update kr.m3u
Allan Fernando a1bbdcccd9
Update kr.m3u
Allan Fernando 52635ebc8c
Update kr.m3u
BountyChocolate123456 8f22cd01e1
Add Arirang mirrors
BountyChocolate123456 2dae59d498
Update jp.m3u
BountyChocolate123456 d9a1862150
Merge branch 'master' into BountyChocolate123456-patch-1
LaneSh4d0w 6f69d08edd
GR : change certain links.
LaneSh4d0w 3d0a0789d5
Update co.m3u
LaneSh4d0w f60eb08d21
CO : update names & add Cablenoticias
Close 
iptv-bot[bot] 5eef6758d6
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
LaneSh4d0w 7b03577644
telesur adaptive
LaneSh4d0w cdad720f7f
VE : Add secondary Televen stream
no port, official stream.
BountyChocolate123456 e96c34a7f5
Use adaprive S4C
LaneSh4d0w e195ab4bde
Merge branch 'master' into patch-1
iptv-bot[bot] 1b0230ebb6
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
LaneSh4d0w fd418c76a7
fix language mistake
LaneSh4d0w 80f4839911
Merge branch 'master' into patch-1
LaneSh4d0w 2772811ab1
add country code to match other services' files
VoXaN24 33aebd7d10
Update MBC 2 Flux
VoXaN24 cd7fb84f39
Update RTVA Flux to the newer (Extract from web)
iptv-bot[bot] 0bb2a6cc71
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
BountyChocolate123456 65a981894d
Merge branch 'master' into patch-1
iptv-bot[bot] 4e7f2fd8ca
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
Aleksandr Statciuk 88663de857
Merge branch 'master' into BountyChocolate123456-patch-6
BountyChocolate123456 c2b63da45d
Merge branch 'master' into BountyChocolate123456-patch-6
BountyChocolate123456 2ece9596ba
Merge branch 'master' into patch-1
BountyChocolate123456 e56d4d703e
Merge branch 'master' into patch-14
BountyChocolate123456 b9b6707121
Merge branch 'master' into patch-14
BountyChocolate123456 24412163ff
Merge branch 'master' into BountyChocolate123456-patch-6
BountyChocolate123456 0511d88d50
Merge branch 'master' into patch-1
BountyChocolate123456 ed8e38dfb9
Merge branch 'master' into BountyChocolate123456-patch-3
iptv-bot[bot] 60049992bc
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
BountyChocolate123456 18e5b90ed0
Merge branch 'master' into BountyChocolate123456-patch-6
BountyChocolate123456 9906c89e77
Merge branch 'master' into patch-1
BountyChocolate123456 961cbb26cd
Merge branch 'master' into BountyChocolate123456-patch-3
iptv-bot[bot] edd6e6b112
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
BountyChocolate123456 94a8830c7b
Merge branch 'master' into patch-1
BountyChocolate123456 bde6fc7d76
Merge branch 'master' into BountyChocolate123456-patch-3
Manipulativemachan 1cbba07a17
Added two channels
iptv-bot[bot] 43435e311e
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
iptv-bot[bot] b94e950134
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
Aleksandr Statciuk bc6f587f6e Fixes validation issues
BountyChocolate123456 ee2f104602
Merge branch 'master' into BountyChocolate123456-patch-6
BountyChocolate123456 7459bc14a6
Merge branch 'master' into patch-1
BountyChocolate123456 e53a718637
Merge branch 'master' into BountyChocolate123456-patch-3
iptv-bot[bot] 1883d22838
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
iptv-bot[bot] dfa5641dc8
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
BountyChocolate123456 38d9c98fb0
Apply suggestions from code review
BountyChocolate123456 0b6d2353c5
Update streams/euronews.m3u
BountyChocolate123456 7b65f119ee
Update streams/euronews.m3u
BountyChocolate123456 b5473a2527
Update streams/euronews.m3u
BountyChocolate123456 99661ae0d3
Update streams/euronews.m3u
BountyChocolate123456 782153ece7
Update jo.m3u
BountyChocolate123456 0d6824840a
Merge branch 'master' into BountyChocolate123456-patch-6
pimboli 196297b0ca
Merge branch 'master' into patch-1
iptv-bot[bot] 88584fabfd
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
pimboli 5a1d5dc3f6
Extracted euronews streams
iptv-bot[bot] f98a8f2618
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
LaneSh4d0w 5ace98f6d7
Merge branch 'master' into LaneSh4d0w-patch-3
LaneSh4d0w 191a067a67
Merge branch 'master' into islilla-patch
BountyChocolate123456 1233b28938
Merge branch 'master' into BountyChocolate123456-patch-6
iptv-bot[bot] b35f24a878
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
F640 fe470c0c1e
Merge branch 'master' into patch-1
BountyChocolate123456 2677fd123f
Merge branch 'master' into BountyChocolate123456-patch-6
BountyChocolate123456 a8eebb8610
Merge branch 'master' into BountyChocolate123456-patch-5
F640 22eb837ade
Update kr.m3u
Enjoy while it lasts
F640 6ec7350ec6
Merge branch 'master' into patch-1
F640 4fac9c15c1
Fixed URL typo
LaneSh4d0w 0deff9db72
Merge branch 'master' into islilla-patch
LaneSh4d0w 050ea8c164
Merge branch 'master' into BountyChocolate123456-patch-4
LaneSh4d0w d06a936217
Merge branch 'master' into patch-1
LaneSh4d0w 1c9b7dc838
Merge branch 'master' into BountyChocolate123456-patch-4
LaneSh4d0w f3fb623d65
Merge branch 'master' into BountyChocolate123456-patch-5
LaneSh4d0w f88ae6c9e3
Merge branch 'master' into BountyChocolate123456-patch-2
iptv-bot[bot] 36788fc61e
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
Diego abd69a0433
Update pe.m3u
Diego 9671a48539
Update pe.m3u
Diego f581eba5e1
Update pe.m3u
Diego 51b3989fd4
Update pe.m3u
Diego 1d4c5f9528
Update pe.m3u
Add TVPeru
Diego c413d6f976
Update pe.m3u
Diego 591f1c7a9a
Update pe.m3u
Diego cd5869e0f2
Update pe.m3u
Add three peruvian channels
Diego 1b6c120a99
Merge branch 'master' into latinokids-patch
BountyChocolate123456 7ba998e0e8
Merge branch 'master' into BountyChocolate123456-patch-3
BountyChocolate123456 6a3060fbc5
Merge branch 'master' into BountyChocolate123456-patch-4
BountyChocolate123456 b28263c750
Merge branch 'master' into BountyChocolate123456-patch-6
BountyChocolate123456 386209fdb2
Merge branch 'master' into latinokids-patch
LaneSh4d0w a693d66354
Merge branch 'master' into patch-1
iptv-bot[bot] aadbb2a77d
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
BountyChocolate123456 9127118cb4
Merge branch 'master' into BountyChocolate123456-patch-2
BountyChocolate123456 403ab20b1e
Merge branch 'master' into BountyChocolate123456-patch-3
BountyChocolate123456 9571c0d1bf
Merge branch 'master' into BountyChocolate123456-patch-4
BountyChocolate123456 7e108b7c26
Merge branch 'master' into BountyChocolate123456-patch-5
BountyChocolate123456 10e1499d76
Merge branch 'master' into BountyChocolate123456-patch-6
BountyChocolate123456 838ffeddac
Merge branch 'master' into latinokids-patch
F640 49b307e674
Added Unas TV
iptv-bot[bot] e8b3978c7a
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
F640 29b1555f17
Added Motorvision (different feed than existing)
F640 164a146b68
Added Phoenix Chinese Channel
F640 eedd89f45c
Added Wion
There are 2 feeds in this channel, domestic and international.
F640 0b2486c058
Update cn.m3u
F640 898c53abde
Added TVE Internacional Asia-Oceania
F640 ceb140f6bf
Update pt.m3u
F640 4b0c7ea89d
Added Rai Italia Asia
F640 9de8d75f0d
Added Dubai TV International
F640 e03e4c4c5e
Update in.m3u
Diego c3aaa35943
Update uy.m3u
LaneSh4d0w aa01e450ce
Merge branch 'master' into patch-6
F640 7b0e945f31
Update hk.m3u
F640 5660ff9f20
Added Toonmax
F640 8e2292e69c
Update streams/id.m3u
Co-authored-by: LaneSh4d0w <lanesh4d0w@gmail.com>
F640 aa7bd7b8e3
Update streams/id.m3u
Co-authored-by: LaneSh4d0w <lanesh4d0w@gmail.com>
F640 bbed9617e6
Update streams/id.m3u (maintainer's feedback)
Co-authored-by: LaneSh4d0w <lanesh4d0w@gmail.com>
F640 3bbcff1ad3
Update streams/id.m3u
Co-authored-by: LaneSh4d0w <lanesh4d0w@gmail.com>
iptv-bot[bot] 31a04dbe86
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
LaneSh4d0w 5d9a24c65f
Update uk.m3u
LaneSh4d0w 13bdfe8d1c
Update uk.m3u
LaneSh4d0w 8deea0f706
changed certain links
LaneSh4d0w 9813757c7e
Update ru.m3u
F640 2cdefe9875
Re-added RTV
This channel suddenly missing for unknown reason
F640 6b565fb27c
Added Toonz Kids
F640 f4816d957c
Removed Toonz Kids from id.m3u
Ref: https://www.lyngsat.com/tvchannels/in/Toonz-Kids.html and https://toonz.co/contact-us/
F640 7a1927c55d
Added Tech Storm (Geo-blocked to Indonesia)
F640 20fe7e7a07
Fixed GEM EPG ID
BountyChocolate123456 174be1e04b
Merge branch 'master' into BountyChocolate123456-patch-3
BountyChocolate123456 667c8ab26c
Merge branch 'master' into BountyChocolate123456-patch-4
BountyChocolate123456 6fb475dc7e
Merge branch 'master' into BountyChocolate123456-patch-5
BountyChocolate123456 c3f4494776
Merge branch 'master' into BountyChocolate123456-patch-6
F640 c9cb5fa4f2
Update us.m3u
F640 ab6b344c35
Update sg.m3u
F640 9654b6fdbf
Update cn.m3u
Lots of channels in this playlist have no tvg-id.
F640 99faaa0a56
Moved Animax to fptplay playlist
F640 7db83b2c81
Fixed Animax Asia EPG ID
F640 9602f40119
Update kr.m3u
F640 6a87f1d2de
Update ch.m3u
F640 9c0b7e29e5
Update ch.m3u
F640 9250c2cb7d
Update my.m3u
F640 109ce2606d
Update hk.m3u
F640 e4f15e0e33
Update in.m3u
F640 e46e69a909
Update my.m3u
F640 df012c215c
Update fr.m3u
F640 3151846246
Update id.m3u
Added Dens TV not geo-blocked links, added some channels (mostly from Kugo) and replaced some links. As well as removed Dens Live Streaming since it's odd to be there.
Diego faaaa9b4e4
Update cn.m3u
Diego 53c5ab7c5c
Merge branch 'master' into BountyChocolate123456-patch-1
iptv-bot[bot] 13a95e463e
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
BountyChocolate123456 92a50da9fb
Add AtfalWaMawaheb mirror
BountyChocolate123456 8693fddfc5
Update lb.m3u
BountyChocolate123456 8877f10a85
Clean qa.m3u
BountyChocolate123456 d5df3f5a98
Update tr.m3u
BountyChocolate123456 d33b0035a9
Fix TRT channels
BountyChocolate123456 7cd57f6e1d
Remove broken links that have mirrors
LaneSh4d0w 003ec73fd5
MN : Add channels
LaneSh4d0w 6cf55bd335
AL : return of the Tring
BountyChocolate123456 df07d58901
Merge branch 'master' into BountyChocolate123456-patch-1
LaneSh4d0w 70b560e994
Merge branch 'master' into LaneSh4d0w-patch-8
LaneSh4d0w 5621133a77
Merge branch 'master' into rte-patch
LaneSh4d0w fb915ddbcc
KZ : Add channels
BountyChocolate123456 7e82ca7a39
Replace CGTN with adaptive playlist
LaneSh4d0w e32750a5fb
PR : Add Wipr
LaneSh4d0w 1169667646
UK : Add alternative BBC World News
Diego bad0d34886
Update cn.m3u
Set id for CGTN Español
LaneSh4d0w a746adffca
Merge branch 'master' into LaneSh4d0w-patch-8
Diego fe5e5b6815
Update ru.m3u
Set id for RT en Español
LaneSh4d0w a7d67eb6e3
US : Add other channels
LaneSh4d0w dc05468bdb
US : add channels
LaneSh4d0w 14103d2a56
CA : Add Noovo
LaneSh4d0w 703c3285df
Update ru.m3u
LaneSh4d0w 344dd7d974
Update it.m3u
LaneSh4d0w 44a66325fd
Update it.m3u
LaneSh4d0w 8c9bf281e7
Merge branch 'master' into LaneSh4d0w-patch-3
LaneSh4d0w 3c60e25c0b
UK : Add Hadi TV list
LaneSh4d0w f05349dd74
IN : Add Zainabia Channel
LaneSh4d0w aecc537662
Update co.m3u
LaneSh4d0w 740031f3cb
Merge branch 'master' into BountyChocolate123456-patch-1
BountyChocolate123456 ce2515c33b
Merge branch 'master' into BountyChocolate123456-patch-2
BountyChocolate123456 d714f938c9
Merge branch 'master' into BountyChocolate123456-patch-1
BountyChocolate123456 0d00227f86
Add live_web mirros
iptv-bot[bot] e8e4bbaf0d
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
LaneSh4d0w 2c295d2c97
Merge branch 'master' into patch-6
LaneSh4d0w fc1f3676bb
CO : deleting all hvtrafico streams
Server does not answer now.
LaneSh4d0w 60e5e59eed
remove hvtrafico links + remove definst
BountyChocolate123456 545bc84054
Update uk_samsung.m3u
BountyChocolate123456 f9882fde31
Update fr.m3u
BountyChocolate123456 d9a39f2b05
Update fr.m3u
BountyChocolate123456 ab1f86f492
Add France 24 Español & France 24 French + cleanup
iptv-bot[bot] fea1757389
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
Central302 f5dfeca360
Merge branch 'master' into Central302-patch-1
Central302 81d99a6658
Merge branch 'master' into Central302-patch-1
BountyChocolate123456 162f112015
Fix Al-Etejah
BountyChocolate123456 5a6af15e3b
Merge branch 'master' into patch-11
Central302 9090e55ae0
Merge branch 'master' into Central302-patch-1
iptv-bot[bot] 362410bcfe
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
LaneSh4d0w 738beb166d
Merge branch 'master' into patch-11
LaneSh4d0w 5d65fbc5a5
Merge branch 'master' into patch-13
Central302 a5794dad78
Merge branch 'master' into Central302-patch-1
Aleksandr Statciuk 778ec579bb
Merge branch 'master' into patch-10
Aleksandr Statciuk b617dd09ca
Merge branch 'master' into patch-11
Aleksandr Statciuk 2970240694
Merge branch 'master' into patch-12
fotvnetwork acb8a55930
Update ph.m3u
CLTV 36 ()
iptv-bot[bot] 38ce422d04
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
Central302 fec08c9fee
Merge branch 'master' into Central302-patch-1
Central302 d01bab45f5
Update streams/us.m3u
Co-authored-by: LaneSh4d0w <lanesh4d0w@gmail.com>
iptv-bot[bot] d487137936
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
Central302 af5a58cf26
Update us.m3u
Aleksandr Statciuk adc2a2d675
Merge pull request from iptv-org/update-uk-m3u
Remove links to Sky News
iptv-bot[bot] 2d276d6604
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
Aleksandr Statciuk a130b60958
Merge branch 'master' into update-uk-m3u
Aleksandr Statciuk bd64db675b Fixes validation issues
Aleksandr Statciuk 4cb7353a33 Update uk.m3u
BountyChocolate123456 034c80aec3
Update iq.m3u
BountyChocolate123456 64701eca4a
Fix Melody FM Jordan
BountyChocolate123456 080b18796a
Delere RT Arabic Youtube link
BountyChocolate123456 41833da0e1
delete Abu Dhabi Drama & EXPO 2020
iptv-bot[bot] 6807469e5e
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
iptv-bot[bot] be80585d43
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
Aleksandr Statciuk a7f3ea0513 Fixes validation issues
LaneSh4d0w 3db32a9eb6
Merge branch 'master' into patch-1
F640 992788a214
Moved fptplay URL (in this PR) to vn_fptplay.m3u
F640 1a50b9454e
Update uk.m3u
F640 238206a112
Update de.m3u
F640 35afb02f1d
Update hk.m3u
F640 fceb69aef0
Update us.m3u
iptv-bot[bot] 168d78c0f0
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
F640 dee0d65602
Update uk.m3u
F640 b980d0f56d
Update vn_fptplay.m3u
F640 75620f35a9
Update uk.m3u
F640 40e13b705b
Update uk.m3u
F640 8edb97d971
Update us.m3u
F640 b4c50fc7bc
Update de.m3u
F640 cf3100abf0
Update hk.m3u
F640 0c4f9f4487
Update uk.m3u
F640 9925913ad8
Added some channels
F640 2fd3996273
Repaired dead link and added some channels
LaneSh4d0w 069bd03223
Update ru.m3u
LaneSh4d0w 6b6a77e64f
Merge branch 'master' into F640-patch-1
Aleksandr Statciuk aef2489975 Merge branch 'master' of github.com:iptv-org/iptv
Aleksandr Statciuk a151ad300c Fixes validation issues
iptv-bot[bot] 4a2f445ade
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
LaneSh4d0w 530047cdc7
Merge branch 'master' into F640-patch-1
F640 8c12cd90f1
Accepted maintainer commit
Co-authored-by: LaneSh4d0w <lanesh4d0w@gmail.com>
F640 2c3a9e8096
Accepted maintainer commit
Co-authored-by: LaneSh4d0w <lanesh4d0w@gmail.com>
F640 1aa41bd314
Accepted maintainer commit
Co-authored-by: LaneSh4d0w <lanesh4d0w@gmail.com>
F640 0ea505e5e0
Repaired dead link and added RTB Aneka
LaneSh4d0w 4184bd1a7e
Merge branch 'master' into LaneSh4d0w-patch-6
iptv-bot[bot] 0eaf6f132e
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
Aleksandr Statciuk d25b2f3ef0 Fixes validation issues
LaneSh4d0w 176de1a2bd
Merge branch 'master' into patch-8
Aleksandr Statciuk 872a9ec25d Merge branch 'master' into LaneSh4d0w-patch-5
Aleksandr Statciuk b93b149ab0
Merge branch 'master' into patch-9
Aleksandr Statciuk 8d36cd6d63
Merge branch 'master' into LaneSh4d0w-patch-9
iptv-bot[bot] 58bb99c2d8
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
F640 01f03c98c2
Merged Intechmedia (YouTV) channels
Same as fb0e11abf1
F640 fb0e11abf1
Update id.m3u
F640 d5001555b0
Updated One TV channel ID
Should this channel move to somewhere?
F640 706404371f
Update id.m3u
iptv-bot[bot] 0a39f2bd6e
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
F640 86b4f8b277
Changed some stream quality label
F640 9f8fb82214
Updated r c t i + streams
They have changed their streams recently
BountyChocolate123456 c05e87001b
Fix The Kingdom Sat
BountyChocolate123456 8e87ae6a50
Fix Al Rai
iptv-bot[bot] 925c5b16a3
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
LaneSh4d0w 9793fd76e8
Merge branch 'master' into patch-1
iptv-bot[bot] ea3ece12b2
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
dev-onetv 65f66413f3
Merge branch 'master' into patch-1
iptv-bot[bot] 4dda062cfa
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
F640 21b2c6bd20
Added another Riau TV URL
For alternative if main (jpm stream) link offline
F640 a8b941dd6e
Added, edited, and rearranged some channels
F640 c715d45195
Added TV Edukasi
F640 b5fa775eb0
Added, edited and rearranged some channels
LaneSh4d0w 5e8dec81dc
Merge branch 'master' into LaneSh4d0w-patch-9
LaneSh4d0w 2a9aa08a3e
Merge branch 'master' into patch-1
LaneSh4d0w def004ad86
Merge branch 'master' into LaneSh4d0w-patch-2
iptv-bot[bot] 44148a2617
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
dev-onetv 284f72f596
Updated ir_telewebion.m3u
I have corrected the link and cleaned up this playlist. I have tested all the channels. They are all working now. Please consider merging this changes and adding these channels to the main playlist (index.m3u)
LaneSh4d0w 3564316f51
Merge branch 'master' into LaneSh4d0w-patch-2
LaneSh4d0w 14b431a1c0
Merge branch 'master' into LaneSh4d0w-patch-7
iptv-bot[bot] 35f18cd813
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
LaneSh4d0w 967e3fe03c
Merge branch 'master' into fix-es_rakuten.m3u
Central302 171b621b24
Merge branch 'master' into LaneSh4d0w-patch-7
LaneSh4d0w 0ef4a5f3fd
Merge branch 'master' into LaneSh4d0w-patch-6
LaneSh4d0w 16ad67093b
Update kr.m3u
LaneSh4d0w 707a3062c8
Update kr.m3u
LaneSh4d0w cd3692b6a8
Merge branch 'master' into F640-patch-1
F640 160d0086bd
Added Bali TV not geo-blocked stream
MNCNow still has unprotected stream, maybe the last one? That's good, hope it won't die or suddenly protected with DRM.
iptv-bot[bot] fc8ac35749
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
LaneSh4d0w 0b75b5f3e1
Update ae.m3u
LaneSh4d0w b6eb2337d9
Update kr.m3u
LaneSh4d0w 4dec642c20
Update kr.m3u
LaneSh4d0w 18abb66277
Merge branch 'master' into LaneSh4d0w-patch-7
LaneSh4d0w 50d30143b3
Delete nl_rakuten.m3u
LaneSh4d0w e5901d4299
Update de_rakuten.m3u
LaneSh4d0w e8c58e400d
Update fr_rakuten.m3u
Aleksandr Statciuk fb5a9c9266 Update nl_rakuten.m3u
Aleksandr Statciuk 1b793736ca Update es_rakuten.m3u
Aleksandr Statciuk 3be6551e5c Create uk_rakuten.m3u
Aleksandr Statciuk 1b3e795314 Create nl_rakuten.m3u
Aleksandr Statciuk 54c2e8563d Create it_rakuten.m3u
Aleksandr Statciuk d62ee96c4a Create fr_rakuten.m3u
Aleksandr Statciuk 41c6805a0d Create de_rakuten.m3u
Aleksandr Statciuk 0275688692 Update es_rakuten.m3u
Aleksandr Statciuk c2167157f7 Update vn_fptplay.m3u
iptv-bot[bot] 279a18357e
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
LaneSh4d0w 53c0643277
KR : Fix MBC regional links
iptv-bot[bot] fe54e47719
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
Aleksandr Statciuk a7823b6f54 Fix validation issues
iptv-bot[bot] 38e815da02
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
LaneSh4d0w b518b7beed
US : Add Nickelodeon Ukraine
iptv-bot[bot] 60625c1b81
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
F640 e03a7fb3c6
Added Dens TV in-house channels.
F640 3c361cfeda
Added One TV
iptv-bot[bot] 169625f385
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
F640 9b2e7ec60c
Added Zee Bioskop
F640 0442a94e8a
Added some channels
F640 a25965f19d
Added Dayak TV
This one online right before i made this commit
iptv-bot[bot] 9eae14eaa5
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
LaneSh4d0w e52705428e
CZ : add RTMP + CT1
LaneSh4d0w 5e52b4ab52
Merge branch 'master' into LaneSh4d0w-patch-7
LaneSh4d0w e0dc5cf072
Merge branch 'master' into LaneSh4d0w-patch-7
LaneSh4d0w c0a51259bd
Merge branch 'master' into LaneSh4d0w-patch-6
iptv-bot[bot] 2b4b857daa
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
LaneSh4d0w aa3ab7e350
CY : Modify MCTV channels
per database modification on https://github.com/iptv-org/database/pull/84
put NSFW channels where they're supposed to be.
F640 d9e49908c0
Added Duta TV
Finally it's online in signed off state (tested 
right before this commit).
F640 9beae67f48
Added Ainos TV
LaneSh4d0w fc8f972449
Merge branch 'master' into ewtn-patch
iptv-bot[bot] 6122b37074
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
Diego 4fb8b52225
Update us.m3u
iptv-bot[bot] 7fc0feb6c2
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
LaneSh4d0w 4d80ca04bf
Merge branch 'master' into LaneSh4d0w-patch-7
iptv-bot[bot] 9583f6d80f
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
F640 a3ffbf6555
Edited some channels url and removed dulicates
F640 7564114a3c
Edited a channel (PR suggestion from maintainer)
Co-authored-by: LaneSh4d0w <lanesh4d0w@gmail.com>
F640 977a627ab0
Edited a channel (PR suggestion)
Co-authored-by: LaneSh4d0w <lanesh4d0w@gmail.com>
LaneSh4d0w e44539cb72
Merge branch 'master' into what-a-patch-1
LaneSh4d0w bf08917b47
Merge branch 'master' into LaneSh4d0w-patch-8
LaneSh4d0w 9bd2e32104
Merge branch 'master' into LaneSh4d0w-patch-5
LaneSh4d0w deb485a73a
Merge branch 'master' into what-a-patch-1
LaneSh4d0w c71be668ae
Merge branch 'master' into LaneSh4d0w-patch-6
Diego 8f2877af85
Update pe.m3u
Diego f569c92ef1
Update pe.m3u
iptv-bot[bot] 006e4996bc
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
LaneSh4d0w 1154cbc8b9
Merge branch 'master' into LaneSh4d0w-patch-5
Omega fef6666d16 Delete ir_telewebion.m3u
Central302 040a9fafa0
Merge branch 'master' into LaneSh4d0w-patch-6
iptv-bot[bot] a50ec2476d
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
LaneSh4d0w e70eca54e6
NO : add channels
LaneSh4d0w b20918dc85
MX : add channels
LaneSh4d0w f47d99ebde
CA_Samsung : Add Heartland
LaneSh4d0w 6d7e1b83e5
US_Samsung : add channels
F640 71232f9bbf
Added AFB TV
iptv-bot[bot] 21f19af7d8
[Bot] Daily update ()
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
F640 478bf3999c
Added Dangdut Tivi and Lombok TV
F640 659cf708c1
Reordered and deleted some channels
F640 7c096be118
Edited id.m3u
F640 4c26388a2d
Clean-up playlist
F640 9e0bf4eeee
Rough (quick) additions
Added channels from my scratch note.
LaneSh4d0w 93938d7830
Update ru.m3u
LaneSh4d0w a7c1e34421
RU : Update links
LaneSh4d0w 39896c036e
Merge branch 'master' into patch-2
LaneSh4d0w 1efc640dd1
Merge branch 'master' into patch-2