Merge branch 'v4' of https://github.com/twbs/derpstrap into v4

Conflicts: dist/css/bootstrap.css dist/css/bootstrap.css.map docs/assets/css/docs.min.css
2026-06-17 19:21:23 +03:00 · 2015-05-27 15:49:55 -07:00
parent bd971c49b0 3fe894ba36
commit 663576a7ae
128 changed files with 24790 additions and 17469 deletions
@@ -127,4 +127,4 @@
    .col-xl-bottom { align-self: flex-end; }
  }

-}
+}