From: Johann-S <johann.servoire@gmail.com>
Date: Sun, 3 Sep 2017 10:56:04 +0000 (+0200)
Subject: Merge branch 'v4-dev' into fix-jumping-modal-on-resize
X-Git-Tag: v4.0.0-beta.2~295^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F23732%2Fhead;p=thirdparty%2Fbootstrap.git

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

e04e42d08c059732153ff6925fa712464cf12207