From: David Bailey <techdavid@users.noreply.github.com>
Date: Tue, 29 Aug 2017 21:42:29 +0000 (+0100)
Subject: Merge branch 'v4-dev' into fix-unwanted-padding-on-modal
X-Git-Tag: v4.0.0-beta.2~299^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a766dd56927d0b107e8c909539bf35f5fc4ecb4e;p=thirdparty%2Fbootstrap.git

Merge branch 'v4-dev' into fix-unwanted-padding-on-modal
---

a766dd56927d0b107e8c909539bf35f5fc4ecb4e