Skip to content

Commit

Permalink
Merge branch 'master' of github.com:ellmetha/django-machina
Browse files Browse the repository at this point in the history
  • Loading branch information
ellmetha committed Aug 7, 2020
2 parents 6b88e7d + 6725caa commit 7f94f2d
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 @@ -9,7 +9,7 @@
"bootstrap": ">=4.3.1",
"easymde": "^2.8.0",
"jquery": ">=3.5.0",
"lodash": ">=4.17.13",
"lodash": ">=4.17.19",
"lodash.template": ">=4.5.0",
"popper.js": "^1.14.4"
},
Expand Down

0 comments on commit 7f94f2d

Please sign in to comment.