merge from dev

This commit is contained in:
Luke Pulverenti 2016-01-14 12:04:42 -05:00
parent d96250df7f
commit bcfee41a57
318 changed files with 54424 additions and 6419 deletions

View file

@ -1,6 +1,6 @@
{
"name": "iron-icons",
"version": "1.1.0",
"version": "1.1.1",
"description": "A set of icons for use with iron-icon",
"authors": [
"The Polymer Authors"
@ -34,11 +34,11 @@
"util",
"update-icons.sh"
],
"_release": "1.1.0",
"_release": "1.1.1",
"_resolution": {
"type": "version",
"tag": "v1.1.0",
"commit": "623d8dae77cd8658ce1f6834b30a4f3f6e2100ea"
"tag": "v1.1.1",
"commit": "77a8e0190d6c481d8b5df0495fa484928880ea53"
},
"_source": "git://github.com/PolymerElements/iron-icons.git",
"_target": "^1.0.0",

View file

@ -1,6 +1,6 @@
{
"name": "iron-icons",
"version": "1.1.0",
"version": "1.1.1",
"description": "A set of icons for use with iron-icon",
"authors": [
"The Polymer Authors"

View file

@ -30,6 +30,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
<link rel="import" href="../maps-icons.html">
<link rel="import" href="../notification-icons.html">
<link rel="import" href="../social-icons.html">
<link rel="import" href="../places-icons.html">
<style is="custom-style">