diff options
| author | Mark Otto <[email protected]> | 2015-08-22 18:58:07 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-08-22 18:58:07 -0700 |
| commit | 16075cc068b14cdbb4cda4fe2c0e5c097824c26c (patch) | |
| tree | d3610456bd6a7e0796e2b816ac97f4250e468e63 /docs | |
| parent | 9c52e03d31be40322f59062551519a7d4e009bef (diff) | |
| parent | d65486270c5a68c915928d5d3275b2e3ae8b697d (diff) | |
| download | bootstrap-16075cc068b14cdbb4cda4fe2c0e5c097824c26c.tar.xz bootstrap-16075cc068b14cdbb4cda4fe2c0e5c097824c26c.zip | |
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/getting-started/browsers-devices.md | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/docs/getting-started/browsers-devices.md b/docs/getting-started/browsers-devices.md index 67fc200ec..fab9a3fea 100644 --- a/docs/getting-started/browsers-devices.md +++ b/docs/getting-started/browsers-devices.md @@ -13,7 +13,7 @@ Bootstrap supports a wide variety of modern browsers and devices, and some older ## Supported browsers -Bootstrap supports the **latest, stable releases** of all major browsers and platforms. On Windows, **we support Internet Explorer 9-11**. More specific support information is provided below. +Bootstrap supports the **latest, stable releases** of all major browsers and platforms. On Windows, **we support Internet Explorer 9-11 / Microsoft Edge**. More specific support information is provided below. ### Mobile devices @@ -64,6 +64,7 @@ Similarly, the latest versions of most desktop browsers are supported. <th>Chrome</th> <th>Firefox</th> <th>Internet Explorer</th> + <th>Microsoft Edge</th> <th>Opera</th> <th>Safari</th> </tr> @@ -74,6 +75,7 @@ Similarly, the latest versions of most desktop browsers are supported. <td class="text-success">Supported</td> <td class="text-success">Supported</td> <td class="text-muted">N/A</td> + <td class="text-muted">N/A</td> <td class="text-success">Supported</td> <td class="text-success">Supported</td> </tr> @@ -83,6 +85,7 @@ Similarly, the latest versions of most desktop browsers are supported. <td class="text-success">Supported</td> <td class="text-success">Supported</td> <td class="text-success">Supported</td> + <td class="text-success">Supported</td> <td class="text-danger">Not supported</td> </tr> </tbody> |