Skip to content

Commit

Permalink
Merge branch 'hotfix/0.4.1-17.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
captainyarr committed Oct 30, 2019
2 parents 1f0bb3e + 8734f9a commit fce73a4
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 15 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
@@ -1,4 +1,4 @@
## 0.4.1-17 Beta - Popcorn Treats - 24 October 2019
## 0.4.1-17.1 Beta - Popcorn Treats - 24 October 2019

New Features:
- Added more information to status screen: Active Users, and Total User, Time remaining
Expand Down
2 changes: 1 addition & 1 deletion install
Expand Up @@ -23,7 +23,7 @@ fi
func_error

#Variables
version="0.4.1-17"
version="0.4.1-17.1"
tos="https://popcorntime.sh/tos"
$path="$HOME/.Popcorn-Time-CE"

Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -10,7 +10,7 @@
},
"license": "GPL-3.0",
"main": "src/app/index.html",
"version": "0.4.1-17",
"version": "0.4.1-17.1",
"node-remote": "*://*",
"releaseName": "Popcorn Treats",
"scripts": {
Expand Down
13 changes: 2 additions & 11 deletions src/app/settings.js
Expand Up @@ -118,19 +118,10 @@ Settings.opensubtitlesUsername = "";
Settings.opensubtitlesPassword = "";

Settings.tvAPI = [{
url: 'http://eztv.is/api/',
url: 'https://api-fetch.website/tv/',
strictSSL: true
}, {
url: 'http://eztvapi.ml/',
strictSSL: true
}, {
url: 'https://eztvapi.ml/',
strictSSL: true
}, {
url: 'https://popcorntime.ws/api/eztv/',
strictSSL: true
}, {
url: 'https://popcorntimece.ch/api/eztv/',
url: 'https://tv-v2.api-fetch.website',
strictSSL: true
}];

Expand Down

0 comments on commit fce73a4

Please sign in to comment.