jschaufuss/DiceCloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'update-meteor-1.4' into update-meteor-1.4-polymer-1.0

Browse Source
This commit is contained in:
Stefan Zermatten
2016-12-20 13:57:56 +02:00
parent 7af2e80ec1 b1fdaa726c
commit 07cb3859db
17 changed files with 222 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
rpg-docs/config.vulcanize
View File

@@ -2,6 +2,7 @@
"polyfill": "/components/webcomponentsjs/webcomponents.min.js",
"useShadowDom": true,
"imports": [
<<<<<<< HEAD
"/components/neon-animated-pages/neon-animated-pages.html",
"/components/neon-animated-pages/animations/cross-fade.html",
"/components/neon-animated-pages/animations/hero-animation.html",
@@ -15,6 +16,27 @@
"/components/iron-item/iron-item.html",
"/components/iron-menu/iron-menu.html",
"/components/app-layout/app-layout.html",
=======
"/custom_components/paper-dropdown/paper-dropdown.html",
"/custom_components/paper-dropdown-menu/paper-dropdown-menu.html",
"/custom_components/paper-diff-slider/paper-diff-slider.html",
"/custom_components/swipe-detect/swipe-detect.html",
"/components/core-animated-pages/core-animated-pages.html",
"/components/core-animated-pages/transitions/cross-fade.html",
"/components/core-animated-pages/transitions/hero-transition.html",
"/components/core-animated-pages/transitions/slide-from-right.html",
"/components/core-icons/av-icons.html",
"/components/core-icons/core-icons.html",
"/components/core-icons/editor-icons.html",
"/components/core-icons/image-icons.html",
"/components/core-icons/social-icons.html",
"/components/core-image/core-image.html",
"/components/core-item/core-item.html",
"/components/core-menu/core-menu.html",
"/components/core-scaffold/core-scaffold.html",
"/components/core-transition/core-transition.html",
>>>>>>> update-meteor-1.4
"/components/paper-button/paper-button.html",
"/components/paper-checkbox/paper-checkbox.html",
@@ -36,11 +58,6 @@
"/components/paper-slider/paper-slider.html",
"/components/paper-tabs/paper-tabs.html",
"/components/paper-toast/paper-toast.html",
"/components/paper-toggle-button/paper-toggle-button.html",
"/custom_components/paper-dropdown/paper-dropdown.html",
"/custom_components/paper-dropdown-menu/paper-dropdown-menu.html",
"/custom_components/paper-diff-slider/paper-diff-slider.html",
"/custom_components/swipe-detect/swipe-detect.html"
"/components/paper-toggle-button/paper-toggle-button.html"
]
}