Bug 1363085 - Part 1. Update license for react-intl usage in activity-stream. r=gerv
authorEd Lee <edilee@mozilla.com>
Tue, 09 May 2017 10:42:22 -0700
changeset 357864 ecfb960dc1097ab0e34b4c83caebc9c88c03c03f
parent 357863 385067a8df33c105a085db31c52d7a68f519f804
child 357865 cd1987f0ceec0a27e266db3d07041ce3a3f4ec6a
push id42527
push useredilee@gmail.com
push dateThu, 11 May 2017 21:19:44 +0000
treeherderautoland@cd1987f0ceec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgerv
bugs1363085
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1363085 - Part 1. Update license for react-intl usage in activity-stream. r=gerv MozReview-Commit-ID: Ec5pNkDlUX2
toolkit/content/license.html
--- a/toolkit/content/license.html
+++ b/toolkit/content/license.html
@@ -144,16 +144,17 @@
       <li><a href="about:license#pocketsphinx">Pocketsphinx License</a></li>
 #endif
       <li><a href="about:license#praton">praton License</a></li>
       <li><a href="about:license#praton1">praton and inet_ntop License</a></li>
       <li><a href="about:license#qcms">qcms License</a></li>
       <li><a href="about:license#qrcode-generator">QR Code Generator License</a></li>
       <li><a href="about:license#raven-js">Raven.js License</a></li>
       <li><a href="about:license#react">React License</a></li>
+      <li><a href="about:license#react-intl">React Intl License</a></li>
       <li><a href="about:license#react-redux">React-Redux License</a></li>
       <li><a href="about:license#react-virtualized">React Virtualized License</a></li>
       <li><a href="about:license#xdg">Red Hat xdg_user_dir_lookup License</a></li>
       <li><a href="about:license#redux">Redux License</a></li>
       <li><a href="about:license#reselect">Reselect License</a></li>
       <li><a href="about:license#hunspell-ru">Russian Spellchecking Dictionary License</a></li>
       <li><a href="about:license#sctp">SCTP Licenses</a></li>
       <li><a href="about:license#skia">Skia License</a></li>
@@ -5036,16 +5037,52 @@ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIA
 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
 ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 </pre>
 
     <hr>
 
+    <h1><a id="react-intl"></a>React Intl License</h1>
+
+    <p>This license applies to the files
+    <span class="path">browser/extensions/activity-stream/vendor/react-intl.js</span>.</p>
+<pre>
+Copyright 2014 Yahoo Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the Yahoo Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL YAHOO! INC. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+</pre>
+
+    <hr>
+
     <h1><a id="react-redux"></a>React-Redux License</h1>
 
     <p>This license applies to the files
     <span class="path">devtools/client/shared/vendor/react-redux.js</span> and
     <span class="path">browser/extensions/activity-stream/vendor/react-redux.js</span>.</p>
 <pre>
 Copyright (c) 2015 Dan Abramov