From: Johann-S <johann.servoire@gmail.com>
Date: Mon, 11 Sep 2017 08:54:35 +0000 (+0200)
Subject: Merge branch 'v4-dev' into collapse-js-with-text-truncate
X-Git-Tag: v4.0.0-beta.2~253^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96659a3cad351eca5e84a38001f19cb4bf8637a9;p=thirdparty%2Fbootstrap.git

Merge branch 'v4-dev' into collapse-js-with-text-truncate
---

96659a3cad351eca5e84a38001f19cb4bf8637a9