diff options
| author | Mark Otto <[email protected]> | 2013-08-05 20:00:23 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-05 20:00:23 -0700 |
| commit | 219f0fe7c54d6ece4fcfc58b140189c12e63f360 (patch) | |
| tree | 0355fdccf1ff8599f63a883dd4723c8d977e1e00 /css.html | |
| parent | 0faf42b4bc3fd301beaa5b5f9b4d367f69899b05 (diff) | |
| parent | ac3cb6974ad0573812b65a2054a5809da9946cb6 (diff) | |
| download | bootstrap-219f0fe7c54d6ece4fcfc58b140189c12e63f360.tar.xz bootstrap-219f0fe7c54d6ece4fcfc58b140189c12e63f360.zip | |
Merge branch '3.0.0-wip' into bs3_alerts_default_class
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'css.html')
| -rw-r--r-- | css.html | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1966,8 +1966,8 @@ For example, <code><section></code> should be wrapped as inline. <tr> <th>Class</th> <th>Small devices <small>Up to 768px</small></th> - <th>Medium devices <small>768px to 979px</small></th> - <th>Large devices <small>980px and up</small></th> + <th>Medium devices <small>768px to 991px</small></th> + <th>Large devices <small>992px and up</small></th> </tr> </thead> <tbody> |