anonfunc/JellyPy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Manually merge v1.4.25 into v2

Browse Source
This commit is contained in:
JonnyWong16
2017-10-02 18:14:46 -07:00
parent 3c04b04b98
commit 37951cd69b
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@@ -1,5 +1,10 @@
# Changelog # Changelog
## v1.4.25 (2017-10-02)
* Fix: Tab instead of spaces preventing startup.
## v1.4.24 (2017-10-01) ## v1.4.24 (2017-10-01)
* Fix: New Plex Web urls. (Thanks @Joshua1337) * Fix: New Plex Web urls. (Thanks @Joshua1337)

6
PlexPy.py
View File

@@ -119,9 +119,9 @@ def main():
plexpy.QUIET = True plexpy.QUIET = True
if args.nofork: if args.nofork:
plexpy.NOFORK = True plexpy.NOFORK = True
logger.info("PlexPy is running as a service, it will not fork when restarted.") logger.info("PlexPy is running as a service, it will not fork when restarted.")
if args.pidfile: if args.pidfile:
plexpy.PIDFILE = str(args.pidfile) plexpy.PIDFILE = str(args.pidfile)

2
plexpy/version.py
View File

@@ -1,2 +1,2 @@
PLEXPY_BRANCH = "master" PLEXPY_BRANCH = "master"
PLEXPY_RELEASE_VERSION = "1.4.24" PLEXPY_RELEASE_VERSION = "1.4.25"