milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix merge conflict

Browse source
This commit is contained in:
Luke Pulverenti 2015-12-19 10:54:44 -05:00
parent ff4c684e54
commit c504f5005d
11 changed files with 151 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dashboard-ui/bower_components/neon-animation/.bower.json vendored
View file

@ -54,7 +54,7 @@
"tag": "v1.0.8",
"commit": "36656916b75a4715b025a03473620002c2650ee8"
},
"_source": "git://github.com/PolymerElements/neon-animation.git",
"_source": "git://github.com/polymerelements/neon-animation.git",
"_target": "^1.0.0",
"_originalSource": "PolymerElements/neon-animation"
"_originalSource": "polymerelements/neon-animation"
}