Skip to content

Commit

Permalink
Merge commit '96e359e57469d0dee6f655f32d436d7aec30daca' into thinx-st…
Browse files Browse the repository at this point in the history
…aging

# Conflicts:
#	package-lock.json
#	package.json
  • Loading branch information
suculent committed Oct 24, 2024
2 parents 2207576 + 96e359e commit c976174
Show file tree
Hide file tree
Showing 2 changed files with 106 additions and 94 deletions.
190 changes: 101 additions & 89 deletions package-lock.json

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

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
},
"dependencies": {
"@hapi/hoek": "11.0.2",
"@slack/rtm-api": "^6.2.1",
"@slack/web-api": "^6.9.1",
"@slack/rtm-api": "^7.0.1",
"@slack/web-api": "^6.12.1",
"@snyk/protect": "^1.1258.0",
"axios": "^1.7.7",
"base-64": "^0.1.0",
Expand All @@ -56,14 +56,14 @@
"influx": "^5.9.3",
"jshint": "^2.13.4",
"jsonwebtoken": "^9.0.0",
"mailgun.js": "^8.0.2",
"mailgun.js": "^10.2.2",
"md5": "^2.3.0",
"mime": "^3.0.0",
"mkdirp": "^1.0.3",
"moment-timezone": "0.5.40",
"morgan": "^1.10.0",
"mqtt": "^5.5.0",
"nano": "^10.1.3",
"mqtt": "^5.7.2",
"nano": "^10.1.4",
"nocache": "^4.0.0",
"node-forge": "^1.3.0",
"node-schedule": "^1.3.2",
Expand Down

0 comments on commit c976174

Please sign in to comment.