Merge branch 'master' of github.com:shower/shower into greenkeeper-shower-material-1.0.4

* 'master' of github.com:shower/shower:
  chore(package): update shower-ribbon to version 2.0.4

# Conflicts:
#	package.json
This commit is contained in:
Vadim Makeev 2016-03-23 23:41:57 +03:00
commit ced502c475
1 changed files with 1 additions and 1 deletions

View File

@ -23,7 +23,7 @@
"dependencies": { "dependencies": {
"shower-core": "^2.0.5", "shower-core": "^2.0.5",
"shower-material": "^1.0.4", "shower-material": "^1.0.4",
"shower-ribbon": "^2.0.3" "shower-ribbon": "^2.0.4"
}, },
"devDependencies": { "devDependencies": {
"grunt": "^0.4.5", "grunt": "^0.4.5",