ivan-igorevich
/
bmstu-mt-wp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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:
Vadim Makeev 2016-02-18 16:42:28 +03:00
parent 25e6747751 541d1444c3
commit faf023608e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -23,7 +23,7 @@
"dependencies": { "dependencies": {
"shower-core": "^2.0.0", "shower-core": "^2.0.0",
"shower-material": "^1.0.1", "shower-material": "^1.0.1",
"shower-ribbon": "^2.0.0" "shower-ribbon": "^2.0.1"
}, },
"devDependencies": { "devDependencies": {
"grunt": "^0.4.5", "grunt": "^0.4.5",