Skip to content

Commit

Permalink
Merge pull request #111 from ergo/gh-pages
Browse files Browse the repository at this point in the history
Bump Polymer to 2.0 release candidate 2, greatly increases performance
  • Loading branch information
mathieuancelin authored May 3, 2017
2 parents 3359e98 + 070631b commit 69334fb
Show file tree
Hide file tree
Showing 126 changed files with 9,202 additions and 3,969 deletions.
2 changes: 1 addition & 1 deletion lib/polymer2/bower_components/polymer/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2014 The Polymer Authors. All rights reserved.
// Copyright (c) 2017 The Polymer Authors. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
Expand Down
295 changes: 267 additions & 28 deletions lib/polymer2/bower_components/polymer/README.md

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions lib/polymer2/bower_components/polymer/bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "polymer",
"version": "2.0.0-preview",
"version": "2.0.0-rc.7",
"main": [
"polymer.html"
],
Expand All @@ -21,15 +21,15 @@
"url": "https://github.com/Polymer/polymer.git"
},
"dependencies": {
"shadycss": "webcomponents/shadycss#master",
"webcomponentsjs": "#v1"
"shadycss": "webcomponents/shadycss#^v1.0.0-rc.1",
"webcomponentsjs": "^v1.0.0-rc.5"
},
"devDependencies": {
"web-component-tester": "^5",
"test-fixture": "PolymerElements/test-fixture#safari9-constructor"
"test-fixture": "PolymerElements/test-fixture#3.0.0-rc.1"
},
"private": true,
"resolutions": {
"test-fixture": "safari9-constructor"
"test-fixture": "3.0.0-rc.1"
}
}
Loading

0 comments on commit 69334fb

Please sign in to comment.