Bug 1349288 - Update license to allow activity-stream to use React, Redux, Reselect, and ReactRedux r=gerv,standard8
authork88hudson <khudson@mozilla.com>
Thu, 30 Mar 2017 13:30:30 -0400
changeset 350894 e22dff1f7912bc7fc700d0a50ba9d4548c367f6d
parent 350893 7dc38604b3127751f1b3ebcdcdf1507096d95d7c
child 350895 9bf5112d0dbf71fd2799d25a2941132f599b21c3
push id39977
push usermbanner@mozilla.com
push dateMon, 03 Apr 2017 08:13:40 +0000
treeherderautoland@9bf5112d0dbf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgerv, standard8
bugs1349288
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 1349288 - Update license to allow activity-stream to use React, Redux, Reselect, and ReactRedux r=gerv,standard8 MozReview-Commit-ID: FTZ626l2QG2
toolkit/content/license.html
--- a/toolkit/content/license.html
+++ b/toolkit/content/license.html
@@ -4972,18 +4972,19 @@ ANY THEORY OF LIABILITY, WHETHER IN CONT
 (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 file
-    <span class="path">devtools/client/shared/vendor/react-redux.js</span>.</p>
+    <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
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
@@ -5061,17 +5062,18 @@ CONNECTION WITH THE SOFTWARE OR THE USE 
 SOFTWARE.
 </pre>
 
     <hr>
 
     <h1><a id="redux"></a>Redux License</h1>
 
     <p>This license applies to the file
-    <span class="path">devtools/client/shared/vendor/redux.js</span>.</p>
+    <span class="path">devtools/client/shared/vendor/redux.js</span> and
+    <span class="path">browser/extensions/activity-stream/vendor/Redux.jsm</span>.</p>
 <pre>
 Copyright (c) 2015 Dan Abramov
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
@@ -5089,17 +5091,18 @@ OUT OF OR IN CONNECTION WITH THE SOFTWAR
 SOFTWARE.
 </pre>
 
 <hr>
 
 <h1><a id="reselect"></a>Reselect License</h1>
 
 <p>This license applies to the file
-<span class="path">devtools/client/shared/vendor/reselect.js</span>.</p>
+<span class="path">devtools/client/shared/vendor/reselect.js</span> and
+<span class="path">browser/extensions/activity-stream/vendor/reselect.js</span>.</p>
 <pre>
 The MIT License (MIT)
 
 Copyright (c) 2015-2016 Reselect Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights