Merge branch 'master' into v4m

2025-08-30 08:39:56 +02:00 · 2015-08-04 22:29:45 -07:00
parent 8ee9da2f54 ab412b2404
commit 1ddc3f5e21
42 changed files with 1101 additions and 1005 deletions
--- a/README.md
+++ b/README.md
@@ -45,7 +45,8 @@ bootstrap/
 ├── css/
 │   ├── bootstrap.css
 │   ├── bootstrap.css.map
-│   └── bootstrap.min.css
+│   ├── bootstrap.min.css
+│   └── bootstrap.min.css.map
 └── js/
    ├── bootstrap.js
    └── bootstrap.min.js