diff options
| author | Anders Kaseorg <[email protected]> | 2017-01-20 12:29:59 -0500 |
|---|---|---|
| committer | Anders Kaseorg <[email protected]> | 2017-01-21 13:22:14 -0500 |
| commit | 6887a0f57307820b097b51aee952c555bcf69024 (patch) | |
| tree | ff041c03ac0251468eb4308927052f8bd6071ca3 /lib/dojo/LICENSE | |
| parent | 9f539be3c2c93ce358b10ca396e922b3b99b56ea (diff) | |
lib: Upgrade Dojo and Dijit from 1.8.3 to 1.12.1
The itemNode and expandoNode elements have changed from img to
span (https://bugs.dojotoolkit.org/ticket/16699), so we now put our
tree icons inside them rather than replacing them.
Signed-off-by: Anders Kaseorg <[email protected]>
Diffstat (limited to 'lib/dojo/LICENSE')
| -rw-r--r-- | lib/dojo/LICENSE | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/dojo/LICENSE b/lib/dojo/LICENSE index 483ea9b52..3f5577d25 100644 --- a/lib/dojo/LICENSE +++ b/lib/dojo/LICENSE @@ -1,19 +1,19 @@ Dojo is available under *either* the terms of the modified BSD license *or* the Academic Free License version 2.1. As a recipient of Dojo, you may choose which license to receive this code under (except as noted in per-module LICENSE -files). Some modules may not be the copyright of the Dojo Foundation. These +files). Some modules may not be the copyright of the JS Foundation. These modules contain explicit declarations of copyright in both the LICENSE files in the directories in which they reside and in the code itself. No external contributions are allowed under licenses which are fundamentally incompatible with the AFL or BSD licenses that Dojo is distributed under. -The text of the AFL and BSD licenses is reproduced below. +The text of the AFL and BSD licenses is reproduced below. ------------------------------------------------------------------------------- The "New" BSD License: ********************** -Copyright (c) 2005-2012, The Dojo Foundation +Copyright (c) 2005-2016, The JS Foundation All rights reserved. Redistribution and use in source and binary forms, with or without @@ -24,7 +24,7 @@ modification, are permitted provided that the following conditions are met: * 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 Dojo Foundation nor the names of its contributors + * Neither the name of the JS Foundation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. |