Skip to content

Commit

Permalink
Merge branch 'dev' into 0.x
Browse files Browse the repository at this point in the history
  • Loading branch information
DariusIII committed Mar 7, 2018
2 parents a151250 + d68074e commit 98faa01
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 13 deletions.
26 changes: 13 additions & 13 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -70,18 +70,18 @@ MYCELIUM_GATEWAY_SECRET=
SCOUT_DRIVER=mysql
SCOUT_QUEUE=false

ITEMS_PER_PAGE=
ITEMS_PER_COVER_PAGE=
MAX_PAGER_RESULTS=
FLOOD_CHECK=
FLOOD_WAIT_TIME=
FLOOD_MAX_REQUESTS_PER_SECOND=
ECHOCLI=
RENAME_PAR2 =
RENAME_MUSIC_MEDIAINFO=
CACHE_EXPIRY_SHORT=
CACHE_EXPIRY_MEDIUM=
CACHE_EXPIRY_LONG=
ITEMS_PER_PAGE=50
ITEMS_PER_COVER_PAGE=25
MAX_PAGER_RESULTS=125000
FLOOD_CHECK=false
FLOOD_WAIT_TIME=5
FLOOD_MAX_REQUESTS_PER_SECOND=5
ECHOCLI=true
RENAME_PAR2 = false
RENAME_MUSIC_MEDIAINFO=true
CACHE_EXPIRY_SHORT=300
CACHE_EXPIRY_MEDIUM=600
CACHE_EXPIRY_LONG=900

SSL_CAFILE=
SSL_CAPATH=
Expand All @@ -100,4 +100,4 @@ SMARTY_CACHING=false
SMARTY_CACHE_LIFE=120
SMARTY_COMPILE_CHECK=false
SMARTY_FORCE_COMPILE=false
SMARTY_CACHE_DRIVER=
SMARTY_CACHE_DRIVER=file
1 change: 1 addition & 0 deletions Changelog
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
2018-03-07 DariusIII
* Chg: Update example .env file
* Fix: Fix bad logic when checking for existing title
* Chg: Add check for existing title in TV class add function
* Fix: Fix wrong categories used in checkProcessTV function of Forking class
Expand Down

0 comments on commit 98faa01

Please sign in to comment.