Merge branch 'master' into greenkeeper-shower-material-1.0.1
* master: chore(package): update shower-ribbon to version 2.0.1 # Conflicts: # package.json
This commit is contained in:
commit
faf023608e
|
@ -23,7 +23,7 @@
|
|||
"dependencies": {
|
||||
"shower-core": "^2.0.0",
|
||||
"shower-material": "^1.0.1",
|
||||
"shower-ribbon": "^2.0.0"
|
||||
"shower-ribbon": "^2.0.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"grunt": "^0.4.5",
|
||||
|
|
Loading…
Reference in New Issue