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

Merge branch 'v4-dev' into fix-jumping-modal-on-resize
---

45baa15932dd9c546c4618acca0b02d6f661e657