diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-04-07 12:16:37 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-04-07 12:16:37 +0200 |
| commit | 6b87dae76d931ead9838db1f66a6ff1fe1cc1dd1 (patch) | |
| tree | 0a2273d9db0499214e18a041987339eac9d20ac9 /ishtar_common/static/select2/LICENSE | |
| parent | 75730c0ac55c935c03e58977405b4b8a2233595d (diff) | |
| parent | 3d8b8d86f01ecb9b37e24e25fd15500b8f4fb2a0 (diff) | |
| download | Ishtar-6b87dae76d931ead9838db1f66a6ff1fe1cc1dd1.tar.bz2 Ishtar-6b87dae76d931ead9838db1f66a6ff1fe1cc1dd1.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'ishtar_common/static/select2/LICENSE')
| -rw-r--r-- | ishtar_common/static/select2/LICENSE | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/ishtar_common/static/select2/LICENSE b/ishtar_common/static/select2/LICENSE deleted file mode 100644 index 0247cc762..000000000 --- a/ishtar_common/static/select2/LICENSE +++ /dev/null @@ -1,18 +0,0 @@ -Copyright 2014 Igor Vaynberg - -Version: @@ver@@ Timestamp: @@timestamp@@ - -This software is licensed under the Apache License, Version 2.0 (the "Apache License") or the GNU -General Public License version 2 (the "GPL License"). You may choose either license to govern your -use of this software only upon the condition that you accept all of the terms of either the Apache -License or the GPL License. - -You may obtain a copy of the Apache License and the GPL License at: - -http://www.apache.org/licenses/LICENSE-2.0 -http://www.gnu.org/licenses/gpl-2.0.html - -Unless required by applicable law or agreed to in writing, software distributed under the Apache License -or the GPL Licesnse is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, -either express or implied. See the Apache License and the GPL License for the specific language governing -permissions and limitations under the Apache License and the GPL License. |