Bug 1349288 - Update license to allow activity-stream to use React, Redux, Reselect, and ReactRedux draft
authork88hudson <khudson@mozilla.com>
Thu, 30 Mar 2017 13:30:30 -0400
changeset 553779 47fe7906d6d0b41e434f1cb9d96a50430e886450
parent 553751 3364cc17988c013c36f2a8123315db2855393011
child 553780 e0d74e538766f5234d58dcb51750d4f4e8e3bc5b
child 554433 b6c46869c43db69aa4ffb878b6823855339ddd69
push id51774
push userkhudson@mozilla.com
push dateThu, 30 Mar 2017 18:05:56 +0000
bugs1349288
milestone55.0a1
Bug 1349288 - Update license to allow activity-stream to use React, Redux, Reselect, and ReactRedux MozReview-Commit-ID: FTZ626l2QG2
toolkit/content/license.html
--- a/toolkit/content/license.html
+++ b/toolkit/content/license.html
@@ -4939,18 +4939,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
@@ -5028,17 +5029,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
@@ -5056,17 +5058,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