From: Mark Otto <markdotto@gmail.com>
Date: Mon, 3 Oct 2016 02:10:25 +0000 (-0700)
Subject: Merge branch 'customizable-grid-gutters-per-breakpoint' of https://github.com/pixelba... 
X-Git-Tag: v4.0.0-alpha.5~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49153ecf4f1daa57c6f09e0cb01f7942cb7baf82;p=thirdparty%2Fbootstrap.git

Merge branch 'customizable-grid-gutters-per-breakpoint' of https://github.com/pixelbandito/bootstrap into pixelbandito-customizable-grid-gutters-per-breakpoint
---

49153ecf4f1daa57c6f09e0cb01f7942cb7baf82
diff --cc docs/layout/grid.md
index ec80156a41,d64322dea4..47e8f4470b
--- a/docs/layout/grid.md
+++ b/docs/layout/grid.md
@@@ -1,7 -1,6 +1,7 @@@
- ---
+ atom---
  layout: docs
  title: Grid system
 +description: Documentation and examples for using Bootstrap's powerful, responsive, and mobile-first grid system.
  group: layout
  ---