Commit 83777d71 authored by Vadim Makeev's avatar Vadim Makeev

Merge branch 'master' into greenkeeper-shower-material-1.0.2

* master:
  chore(package): update shower-core to version 2.0.3

# Conflicts:
#	package.json
parents 1b9687ff 62783291
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
"template" "template"
], ],
"dependencies": { "dependencies": {
"shower-core": "^2.0.2", "shower-core": "^2.0.3",
"shower-material": "^1.0.2", "shower-material": "^1.0.2",
"shower-ribbon": "^2.0.1" "shower-ribbon": "^2.0.1"
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment