Merge remote-tracking branch 'refs/remotes/twbs/v4-dev' into v4-dev

8c04a74c · lucascono · 9aff890e · b29b1e15 · 9aff890e · 9aff890e
Commit 8c04a74c authored 7 years ago by lucascono
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 12 additions and 1 deletion
+12 -1
--- a/apple-touch-icon.png
+++ b/apple-touch-icon.png
--- a/assets/brand/bootstrap-social-logo.png
+++ b/assets/brand/bootstrap-social-logo.png
--- a/assets/brand/bootstrap-social.png
+++ b/assets/brand/bootstrap-social.png
--- a/assets/css/docs.min.css
+++ b/assets/css/docs.min.css
--- a/assets/css/docs.min.css.map
+++ b/assets/css/docs.min.css.map
--- a/assets/img/bootstrap-stack.png
+++ b/assets/img/bootstrap-stack.png
--- a/assets/img/bootstrap-themes.png
+++ b/assets/img/bootstrap-themes.png
--- a/assets/img/bs-themes.png
+++ b/assets/img/bs-themes.png
--- a/assets/img/components.png
+++ b/assets/img/components.png
--- a/assets/img/devices.png
+++ b/assets/img/devices.png
--- a/assets/img/expo-lyft.jpg
+++ b/assets/img/expo-lyft.jpg
--- a/assets/img/expo-newsweek.jpg
+++ b/assets/img/expo-newsweek.jpg
--- a/assets/img/expo-riot.jpg
+++ b/assets/img/expo-riot.jpg
--- a/assets/img/expo-vogue.jpg
+++ b/assets/img/expo-vogue.jpg
--- a/assets/img/favicons/android-chrome-192x192.png
+++ b/assets/img/favicons/android-chrome-192x192.png
--- a/assets/img/favicons/android-chrome-512x512.png
+++ b/assets/img/favicons/android-chrome-512x512.png
--- a/assets/img/favicons/apple-touch-icon.png
+++ b/assets/img/favicons/apple-touch-icon.png
--- a/assets/img/favicons/browserconfig.xml
+++ b/assets/img/favicons/browserconfig.xml
+---
+---
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square150x150logo src="{{ site.baseurl }}/assets/img/favicons/mstile-150x150.png"/>
+            <TileColor>#563d7c</TileColor>
+        </tile>
+    </msapplication>
+</browserconfig>
--- a/assets/img/favicons/favicon-16x16.png
+++ b/assets/img/favicons/favicon-16x16.png
--- a/assets/img/favicons/favicon-32x32.png
+++ b/assets/img/favicons/favicon-32x32.png