updated license for bootstrap 3

This commit is contained in:
Joey Hess 2014-04-29 15:03:18 -04:00
parent 036aa129f7
commit 2920554787
2 changed files with 22 additions and 17 deletions

39
debian/copyright vendored
View file

@ -88,23 +88,28 @@ License: MIT or GPL-2
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Files: static/bootstrap* static/glyphicons-halflings* Files: static/*/bootstrap* static/*/glyphicons-halflings*
Copyright: 2012 Twitter, Inc. Copyright: 2012-2014 Twitter, Inc.
License: Apache-2.0 License: MIT
Licensed under the Apache License, Version 2.0 (the "License"); Copyright (c) 2011-2014 Twitter, Inc
you may not use this file except in compliance with the License. .
You may obtain a copy of the License at Permission is hereby granted, free of charge, to any person obtaining a copy
. of this software and associated documentation files (the "Software"), to deal
http://www.apache.org/licenses/LICENSE-2.0 in the Software without restriction, including without limitation the rights
. to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
Unless required by applicable law or agreed to in writing, software copies of the Software, and to permit persons to whom the Software is
distributed under the License is distributed on an "AS IS" BASIS, furnished to do so, subject to the following conditions:
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. .
See the License for the specific language governing permissions and The above copyright notice and this permission notice shall be included in
limitations under the License. all copies or substantial portions of the Software.
. .
The complete text of the Apache License is distributed in THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
/usr/share/common-licenses/Apache-2.0 on Debian systems. 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+ License: GPL-3+
The full text of version 3 of the GPL is distributed as doc/license/GPL in The full text of version 3 of the GPL is distributed as doc/license/GPL in

Binary file not shown.