merge from dev

2016-01-30 13:52:33 -05:00 · 2016-01-30 13:52:33 -05:00 · db793b9d25
commit db793b9d25
parent 8436c7ff3c
46 changed files with 646 additions and 356 deletions
--- a/dashboard-ui/bower_components/neon-animation/animations/cascaded-animation.html
+++ b/dashboard-ui/bower_components/neon-animation/animations/cascaded-animation.html
@ -22,7 +22,7 @@ Configuration:
  name: 'cascaded-animation',
  animation: <animation-name>,
  nodes: <array-of-nodes>,
-  nodedelay: <node-delay-in-ms>,
+  nodeDelay: <node-delay-in-ms>,
  timing: <animation-timing>
 }
 ```