Permalink
Browse files

Merge branch 'master' of github.com:globalizejs/globalize

  • Loading branch information...
rxaviers committed Oct 17, 2017
2 parents 7408a60 + d5c9c04 commit 331f8195a0d43e508c1c60e746fd41a8e8ef7774
Showing with 4 additions and 3 deletions.
  1. +3 −1 LICENSE.txt → LICENSE
  2. +1 −1 README.md
  3. +0 −1 package.json
View
@@ -1,4 +1,6 @@
Copyright jQuery Foundation and other contributors, https://jquery.org/
The MIT License (MIT)
Copyright JS Foundation and other contributors, https://js.foundation
This software consists of voluntary contributions made by many
individuals. For exact contribution history, see the revision history
View
@@ -700,7 +700,7 @@ Our roadmap is the collection of all open issues and pull requests where you can
├── dist/ (consumable files, the built files)
├── external/ (external dependencies, eg. cldr.js, QUnit, RequireJS)
├── Gruntfile.js (Grunt tasks)
├── LICENSE.txt (license file)
├── LICENSE (license file)
├── package.json (metadata file)
├── README.md (doc file)
├── src/ (source code)
View
@@ -59,7 +59,6 @@
"!examples/**/.tmp-globalize-webpack",
"!examples/plain-javascript/cldrjs",
"!examples/plain-javascript/globalize",
"LICENSE.txt",
"README.md"
],
"repository": {

0 comments on commit 331f819

Please sign in to comment.