summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-04-29 15:03:18 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-04-29 15:03:18 -0400
commitf97da400278862e13adf72c880035314afb69105 (patch)
tree90070c24b7ec24722df911ce910284484b7c6312
parent510589fe0074fe2376d2658f3628583e7661fa0b (diff)
updated license for bootstrap 3
-rw-r--r--debian/copyright39
-rw-r--r--standalone/licences.gzbin60519 -> 60598 bytes
2 files changed, 22 insertions, 17 deletions
diff --git a/debian/copyright b/debian/copyright
index 22bb1193f..12d2f8dcd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -88,23 +88,28 @@ License: MIT or GPL-2
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-Files: static/bootstrap* static/glyphicons-halflings*
-Copyright: 2012 Twitter, Inc.
-License: Apache-2.0
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- .
- http://www.apache.org/licenses/LICENSE-2.0
- .
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- .
- The complete text of the Apache License is distributed in
- /usr/share/common-licenses/Apache-2.0 on Debian systems.
+Files: static/*/bootstrap* static/*/glyphicons-halflings*
+Copyright: 2012-2014 Twitter, Inc.
+License: MIT
+ Copyright (c) 2011-2014 Twitter, Inc
+ .
+ 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
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
License: GPL-3+
The full text of version 3 of the GPL is distributed as doc/license/GPL in
diff --git a/standalone/licences.gz b/standalone/licences.gz
index 422f84225..e97ea95d0 100644
--- a/standalone/licences.gz
+++ b/standalone/licences.gz
Binary files differ