Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'master' of http://git.local.twitter.com/bootstrap

  • Loading branch information...
commit ae02a8a30049844a8bd2f81e74c622196b4a8d2a 2 parents bd1d389 + 6d57f8a
Mark Otto authored
2  .gitignore
... ...
@@ -1 +1 @@
1  
-.DS_Store
  1
+.DS_Store
183  LICENSE
... ...
@@ -1,188 +1,13 @@
1 1
 Copyright 2011 Twitter, Inc.
2 2
 
3 3
 Licensed under the Apache License, Version 2.0 (the "License");
4  
-you may not use this work except in compliance with the License.
5  
-You may obtain a copy of the License below, or at:
  4
+you may not use this file except in compliance with the License.
  5
+You may obtain a copy of the License at
6 6
 
7  
-   http://www.apache.org/licenses/LICENSE-2.0
  7
+http://www.apache.org/licenses/LICENSE-2.0
8 8
 
9 9
 Unless required by applicable law or agreed to in writing, software
10 10
 distributed under the License is distributed on an "AS IS" BASIS,
11 11
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12 12
 See the License for the specific language governing permissions and
13  
-limitations under the License.
14  
-
15  
-                             Apache License
16  
-                       Version 2.0, January 2004
17  
-                    http://www.apache.org/licenses/
18  
-
19  
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
20  
-
21  
-1. Definitions.
22  
-
23  
-  "License" shall mean the terms and conditions for use, reproduction,
24  
-  and distribution as defined by Sections 1 through 9 of this document.
25  
-
26  
-  "Licensor" shall mean the copyright owner or entity authorized by
27  
-  the copyright owner that is granting the License.
28  
-
29  
-  "Legal Entity" shall mean the union of the acting entity and all
30  
-  other entities that control, are controlled by, or are under common
31  
-  control with that entity. For the purposes of this definition,
32  
-  "control" means (i) the power, direct or indirect, to cause the
33  
-  direction or management of such entity, whether by contract or
34  
-  otherwise, or (ii) ownership of fifty percent (50%) or more of the
35  
-  outstanding shares, or (iii) beneficial ownership of such entity.
36  
-
37  
-  "You" (or "Your") shall mean an individual or Legal Entity
38  
-  exercising permissions granted by this License.
39  
-
40  
-  "Source" form shall mean the preferred form for making modifications,
41  
-  including but not limited to software source code, documentation
42  
-  source, and configuration files.
43  
-
44  
-  "Object" form shall mean any form resulting from mechanical
45  
-  transformation or translation of a Source form, including but
46  
-  not limited to compiled object code, generated documentation,
47  
-  and conversions to other media types.
48  
-
49  
-  "Work" shall mean the work of authorship, whether in Source or
50  
-  Object form, made available under the License, as indicated by a
51  
-  copyright notice that is included in or attached to the work
52  
-  (an example is provided in the Appendix below).
53  
-
54  
-  "Derivative Works" shall mean any work, whether in Source or Object
55  
-  form, that is based on (or derived from) the Work and for which the
56  
-  editorial revisions, annotations, elaborations, or other modifications
57  
-  represent, as a whole, an original work of authorship. For the purposes
58  
-  of this License, Derivative Works shall not include works that remain
59  
-  separable from, or merely link (or bind by name) to the interfaces of,
60  
-  the Work and Derivative Works thereof.
61  
-
62  
-  "Contribution" shall mean any work of authorship, including
63  
-  the original version of the Work and any modifications or additions
64  
-  to that Work or Derivative Works thereof, that is intentionally
65  
-  submitted to Licensor for inclusion in the Work by the copyright owner
66  
-  or by an individual or Legal Entity authorized to submit on behalf of
67  
-  the copyright owner. For the purposes of this definition, "submitted"
68  
-  means any form of electronic, verbal, or written communication sent
69  
-  to the Licensor or its representatives, including but not limited to
70  
-  communication on electronic mailing lists, source code control systems,
71  
-  and issue tracking systems that are managed by, or on behalf of, the
72  
-  Licensor for the purpose of discussing and improving the Work, but
73  
-  excluding communication that is conspicuously marked or otherwise
74  
-  designated in writing by the copyright owner as "Not a Contribution."
75  
-
76  
-  "Contributor" shall mean Licensor and any individual or Legal Entity
77  
-  on behalf of whom a Contribution has been received by Licensor and
78  
-  subsequently incorporated within the Work.
79  
-
80  
-2. Grant of Copyright License. Subject to the terms and conditions of
81  
-  this License, each Contributor hereby grants to You a perpetual,
82  
-  worldwide, non-exclusive, no-charge, royalty-free, irrevocable
83  
-  copyright license to reproduce, prepare Derivative Works of,
84  
-  publicly display, publicly perform, sublicense, and distribute the
85  
-  Work and such Derivative Works in Source or Object form.
86  
-
87  
-3. Grant of Patent License. Subject to the terms and conditions of
88  
-  this License, each Contributor hereby grants to You a perpetual,
89  
-  worldwide, non-exclusive, no-charge, royalty-free, irrevocable
90  
-  (except as stated in this section) patent license to make, have made,
91  
-  use, offer to sell, sell, import, and otherwise transfer the Work,
92  
-  where such license applies only to those patent claims licensable
93  
-  by such Contributor that are necessarily infringed by their
94  
-  Contribution(s) alone or by combination of their Contribution(s)
95  
-  with the Work to which such Contribution(s) was submitted. If You
96  
-  institute patent litigation against any entity (including a
97  
-  cross-claim or counterclaim in a lawsuit) alleging that the Work
98  
-  or a Contribution incorporated within the Work constitutes direct
99  
-  or contributory patent infringement, then any patent licenses
100  
-  granted to You under this License for that Work shall terminate
101  
-  as of the date such litigation is filed.
102  
-
103  
-4. Redistribution. You may reproduce and distribute copies of the
104  
-  Work or Derivative Works thereof in any medium, with or without
105  
-  modifications, and in Source or Object form, provided that You
106  
-  meet the following conditions:
107  
-
108  
-  (a) You must give any other recipients of the Work or
109  
-      Derivative Works a copy of this License; and
110  
-
111  
-  (b) You must cause any modified files to carry prominent notices
112  
-      stating that You changed the files; and
113  
-
114  
-  (c) You must retain, in the Source form of any Derivative Works
115  
-      that You distribute, all copyright, patent, trademark, and
116  
-      attribution notices from the Source form of the Work,
117  
-      excluding those notices that do not pertain to any part of
118  
-      the Derivative Works; and
119  
-
120  
-  (d) If the Work includes a "NOTICE" text file as part of its
121  
-      distribution, then any Derivative Works that You distribute must
122  
-      include a readable copy of the attribution notices contained
123  
-      within such NOTICE file, excluding those notices that do not
124  
-      pertain to any part of the Derivative Works, in at least one
125  
-      of the following places: within a NOTICE text file distributed
126  
-      as part of the Derivative Works; within the Source form or
127  
-      documentation, if provided along with the Derivative Works; or,
128  
-      within a display generated by the Derivative Works, if and
129  
-      wherever such third-party notices normally appear. The contents
130  
-      of the NOTICE file are for informational purposes only and
131  
-      do not modify the License. You may add Your own attribution
132  
-      notices within Derivative Works that You distribute, alongside
133  
-      or as an addendum to the NOTICE text from the Work, provided
134  
-      that such additional attribution notices cannot be construed
135  
-      as modifying the License.
136  
-
137  
-  You may add Your own copyright statement to Your modifications and
138  
-  may provide additional or different license terms and conditions
139  
-  for use, reproduction, or distribution of Your modifications, or
140  
-  for any such Derivative Works as a whole, provided Your use,
141  
-  reproduction, and distribution of the Work otherwise complies with
142  
-  the conditions stated in this License.
143  
-
144  
-5. Submission of Contributions. Unless You explicitly state otherwise,
145  
-  any Contribution intentionally submitted for inclusion in the Work
146  
-  by You to the Licensor shall be under the terms and conditions of
147  
-  this License, without any additional terms or conditions.
148  
-  Notwithstanding the above, nothing herein shall supersede or modify
149  
-  the terms of any separate license agreement you may have executed
150  
-  with Licensor regarding such Contributions.
151  
-
152  
-6. Trademarks. This License does not grant permission to use the trade
153  
-  names, trademarks, service marks, or product names of the Licensor,
154  
-  except as required for reasonable and customary use in describing the
155  
-  origin of the Work and reproducing the content of the NOTICE file.
156  
-
157  
-7. Disclaimer of Warranty. Unless required by applicable law or
158  
-  agreed to in writing, Licensor provides the Work (and each
159  
-  Contributor provides its Contributions) on an "AS IS" BASIS,
160  
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
161  
-  implied, including, without limitation, any warranties or conditions
162  
-  of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
163  
-  PARTICULAR PURPOSE. You are solely responsible for determining the
164  
-  appropriateness of using or redistributing the Work and assume any
165  
-  risks associated with Your exercise of permissions under this License.
166  
-
167  
-8. Limitation of Liability. In no event and under no legal theory,
168  
-  whether in tort (including negligence), contract, or otherwise,
169  
-  unless required by applicable law (such as deliberate and grossly
170  
-  negligent acts) or agreed to in writing, shall any Contributor be
171  
-  liable to You for damages, including any direct, indirect, special,
172  
-  incidental, or consequential damages of any character arising as a
173  
-  result of this License or out of the use or inability to use the
174  
-  Work (including but not limited to damages for loss of goodwill,
175  
-  work stoppage, computer failure or malfunction, or any and all
176  
-  other commercial damages or losses), even if such Contributor
177  
-  has been advised of the possibility of such damages.
178  
-
179  
-9. Accepting Warranty or Additional Liability. While redistributing
180  
-  the Work or Derivative Works thereof, You may choose to offer,
181  
-  and charge a fee for, acceptance of support, warranty, indemnity,
182  
-  or other liability obligations and/or rights consistent with this
183  
-  License. However, in accepting such obligations, You may act only
184  
-  on Your own behalf and on Your sole responsibility, not on behalf
185  
-  of any other Contributor, and only if You agree to indemnify,
186  
-  defend, and hold each Contributor harmless for any liability
187  
-  incurred by, or claims asserted against, such Contributor by reason
188  
-  of your accepting any such warranty or additional liability.
  13
+limitations under the License.
7  README.md
Source Rendered
@@ -28,6 +28,13 @@ Reporting bugs
28 28
 
29 29
 Please create an issue here on GitHub! :P
30 30
 
  31
+
  32
+Google Group
  33
+------------
  34
+
  35
+http://groups.google.com/group/twitter-bootstrap
  36
+
  37
+
31 38
 AUTHORS
32 39
 -------
33 40
 

0 notes on commit ae02a8a

Please sign in to comment.
Something went wrong with that request. Please try again.