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/paper-material/paper-material-shared-styles.html
+++ b/dashboard-ui/bower_components/paper-material/paper-material-shared-styles.html
@ -8,6 +8,8 @@ Code distributed by Google as part of the polymer project is also
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->

+<link rel="import" href="../paper-styles/shadow.html">
+
 <dom-module id="paper-material-shared-styles">
  <template>
    <style>