Merge branch 'dev'

This commit is contained in:
JonnyWong16 2016-08-15 08:40:16 -07:00
commit 2a701a6dfe
3 changed files with 2423 additions and 1 deletions

View file

@ -1,5 +1,10 @@
# Changelog
## v1.4.10 (2016-08-15)
* Fix: Missing python ipaddress module preventing PlexPy from starting.
## v1.4.9 (2016-08-14)
* New: Option to include current activity in the history tables.

2417
lib/ipaddress.py Normal file

File diff suppressed because it is too large Load diff

View file

@ -1,2 +1,2 @@
PLEXPY_VERSION = "master"
PLEXPY_RELEASE_VERSION = "1.4.9"
PLEXPY_RELEASE_VERSION = "1.4.10"