Skip to content

Commit

Permalink
Merge branch 'master' of github.com:olivia-ai/olivia-ai.org
Browse files Browse the repository at this point in the history
  • Loading branch information
hugolgst committed Aug 8, 2019
2 parents ccc9ef3 + e1ba166 commit 510ed04
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 @@ -36,7 +36,7 @@
"vue-github-button": "^1.0.8",
"vue-markdown": "^2.2.4",
"vue-resource": "^1.5.1",
"vue-router": "^3.0.7",
"vue-router": "^3.1.1",
"vue-set-state": "^0.1.1"
},
"devDependencies": {
Expand Down

0 comments on commit 510ed04

Please sign in to comment.