Merge branch 'master' into api/v2

2018-10-30 21:02:47 +01:00
parent 8ece7b84c4 8977a4b195
commit e7c66af3f6
2 changed files with 1 additions and 2 deletions
--- a/seasoned_api/package.json
+++ b/seasoned_api/package.json
@@ -22,7 +22,7 @@
    "jsonwebtoken": "^8.0.1",
    "km-moviedb": "^0.2.13",
    "mongoose": "~5.0.11",
-    "moviedb": "^0.2.10",
+    "km-moviedb": "^0.2.12",
    "node-cache": "^4.1.1",
    "python-shell": "^0.5.0",
    "request": "^2.85.0",
--- a/seasoned_api/src/tmdb/tmdb.js
+++ b/seasoned_api/src/tmdb/tmdb.js
@@ -3,7 +3,6 @@ const convertTmdbToMovie = require('src/tmdb/convertTmdbToMovie');
 const convertTmdbToShow = require('src/tmdb/convertTmdbToShow');
 const convertTmdbToPerson = require('src/tmdb/convertTmdbToPerson');

-
 const TMDB_METHODS = {
   upcoming: { movie: 'miscUpcomingMovies' },
   discover: { movie: 'discoverMovie', show: 'discoverTv' },