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 May 18, 2020
2 parents 32417b1 + dbb6d5f commit ace130e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 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 @@ -8,7 +8,7 @@
"@fortawesome/fontawesome-free-webfonts": "^1.0.9",
"bootstrap": ">=4.3.1",
"easymde": "^2.8.0",
"jquery": ">=3.4.0",
"jquery": ">=3.5.0",
"lodash": ">=4.17.13",
"lodash.template": ">=4.5.0",
"popper.js": "^1.14.4"
Expand Down

0 comments on commit ace130e

Please sign in to comment.