Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into allow-create
Browse files Browse the repository at this point in the history
  • Loading branch information
Amy Cheng committed Jan 18, 2018
2 parents 26c4e98 + ff9feb5 commit 40613d0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
@@ -1,6 +1,6 @@
{
"name": "clay-kiln",
"version": "5.10.0",
"version": "5.10.1",
"description": "Editor tools for Clay",
"template": "template.handlebars",
"scripts": {
Expand Down Expand Up @@ -53,7 +53,7 @@
"chai": "^4.1.2",
"chrono-node": "^1.3.5",
"clay-log": "^1.1.1",
"clayhandlebars": "^3.2.2",
"clayhandlebars": "^4.0.0",
"codemirror": "^5.31.0",
"coveralls": "^3.0.0",
"css-loader": "^0.28.7",
Expand Down

0 comments on commit 40613d0

Please sign in to comment.