From 37951cd69ba84c183350911ef5212cf5393aac0c Mon Sep 17 00:00:00 2001
From: JonnyWong16 <JonnyWong16@users.noreply.github.com>
Date: Mon, 2 Oct 2017 18:14:46 -0700
Subject: [PATCH] Manually merge v1.4.25 into v2

---
 CHANGELOG.md      | 5 +++++
 PlexPy.py         | 6 +++---
 plexpy/version.py | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dfe78d0d..b680b77a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## v1.4.25 (2017-10-02)
+
+* Fix: Tab instead of spaces preventing startup.
+
+
 ## v1.4.24 (2017-10-01)
 
 * Fix: New Plex Web urls. (Thanks @Joshua1337)
diff --git a/PlexPy.py b/PlexPy.py
index 1b1bc3b4..5b060fb4 100755
--- a/PlexPy.py
+++ b/PlexPy.py
@@ -119,9 +119,9 @@ def main():
             plexpy.QUIET = True
 
     if args.nofork:
-		plexpy.NOFORK = True
-		logger.info("PlexPy is running as a service, it will not fork when restarted.")
-	
+        plexpy.NOFORK = True
+        logger.info("PlexPy is running as a service, it will not fork when restarted.")
+
     if args.pidfile:
         plexpy.PIDFILE = str(args.pidfile)
 
diff --git a/plexpy/version.py b/plexpy/version.py
index 92328347..171d8132 100644
--- a/plexpy/version.py
+++ b/plexpy/version.py
@@ -1,2 +1,2 @@
 PLEXPY_BRANCH = "master"
-PLEXPY_RELEASE_VERSION = "1.4.24"
+PLEXPY_RELEASE_VERSION = "1.4.25"