From: Maggie Pint Date: Tue, 1 Nov 2016 02:34:56 +0000 (-0700) Subject: update contributing and license for JS Foundation X-Git-Tag: 2.16.0~28 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2012904ce1522164e4c07719c6e98728b52af29d;p=thirdparty%2Fmoment.git update contributing and license for JS Foundation --- diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4c3285a43..82385e3ed 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,6 +7,7 @@ Read before submitting Pull Requests ==================================== * **Pull requests to the `master` branch will be closed.** Please submit all pull requests to the `develop` branch. + * **You will be required to sign a JS Foundation CLA before your pull request can be merged.** * **Locale translations will not be merged without unit tests.** See [the British English unit tests](https://github.com/moment/moment/blob/develop/src/test/locale/en-gb.js) for an example. * **Do not include the minified files in your pull request.** These are `moment.js`, `locale/*.js`, `min/*.js`. Don't worry, we'll build them when diff --git a/LICENSE b/LICENSE index 9ee537448..d91e3c243 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2011-2016 Tim Wood, Iskren Chernev, Moment.js contributors +Copyright (c) Copyright JS Foundation and other contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation