Skip to content

Commit 3a1b5dd

Browse files
committed
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages
Conflicts: index.html
2 parents fd9aca8 + 8bf8b6a commit 3a1b5dd

File tree

8 files changed

+6357
-0
lines changed

8 files changed

+6357
-0
lines changed
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
core-action-icons
2+
=================
3+
4+
This is a _resource_ component which contains image assets for the default core icon set.
5+
6+
While HTML, JS, and CSS can be combined for production deployments by tools like Vulcanizer, some assets are easier to deliver as is.
7+
8+
Projects using the default core icon set should include this component in deployments verbatim.
33.3 KB
Loading
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
core-component-page
2+
===================
3+
4+
See the [component page](http://polymer.github.io/core-component-page) for more information.
5.04 KB
Loading
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"name": "core-component-page",
3+
"private": true,
4+
"dependencies": {
5+
"platform": "Polymer/platform#0.2.4",
6+
"core-action-icons": "Polymer/core-action-icons#0.2.4"
7+
},
8+
"version": "0.2.4"
9+
}

0 commit comments

Comments
 (0)