Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
ctsstc committed Mar 14, 2019
2 parents e4a2cc4 + 9d491d3 commit 4da94a3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"dependencies": {
"axios": "^0.18.0",
"discord.js": "^11.4.2",
"dotenv": "^6.1.0",
"dotenv": "^7.0.0",
"glob": "^7.1.3",
"lodash.camelcase": "^4.3.0",
"moment": "^2.22.2"
Expand Down

0 comments on commit 4da94a3

Please sign in to comment.