Merge branch 'master' into greenkeeper-shower-ribbon-2.0.2

* master:
  chore(package): update shower-material to version 1.0.2

# Conflicts:
#	package.json
This commit is contained in:
Vadim Makeev 2016-02-27 14:13:13 +03:00
commit eb49fac4f8
1 changed files with 1 additions and 1 deletions

View File

@ -22,7 +22,7 @@
],
"dependencies": {
"shower-core": "^2.0.3",
"shower-material": "^1.0.1",
"shower-material": "^1.0.2",
"shower-ribbon": "^2.0.2"
},
"devDependencies": {