Skip to content

Commit

Permalink
Merge branch 'master' into fix_cashflow_report_improve_budget_report
Browse files Browse the repository at this point in the history
  • Loading branch information
jmcameron authored Nov 28, 2024
2 parents a8cdc45 + 4a3000d commit 7bcae6e
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
18 changes: 9 additions & 9 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
"caniuse-lite": "1.0.30001684",
"chart.js": "^3.9.1",
"chartjs-plugin-datalabels": "^2.2.0",
"connect-redis": "^7.1.1",
"connect-redis": "^8.0.0",
"cookie": "1.0.2",
"cron": "^3.2.1",
"cross-env": "^7.0.3",
Expand Down Expand Up @@ -177,7 +177,7 @@
"eslint": "^8.57.1",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-jsdoc": "^50.5.0",
"eslint-plugin-jsdoc": "^50.6.0",
"gulp": "^5.0.0",
"gulp-concat": "^2.6.1",
"gulp-if": "^3.0.0",
Expand Down
2 changes: 1 addition & 1 deletion server/config/express.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const session = require('express-session');
// NOTE: connect-redis now automatically imports the session data from
// express-session. See the migration notes in
// https://github.com/tj/connect-redis/releases/tag/v7.0.0
const RedisStore = require('connect-redis').default;
const { RedisStore } = require('connect-redis');
const Redis = require('ioredis');
const morgan = require('morgan');
const helmet = require('helmet');
Expand Down

0 comments on commit 7bcae6e

Please sign in to comment.