]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge conflict
authorPierre-Denis Vanduynslager <pierre.denis.vanduynslager@gmail.com>
Wed, 4 Jan 2017 17:24:33 +0000 (12:24 -0500)
committerPierre-Denis Vanduynslager <pierre.denis.vanduynslager@gmail.com>
Wed, 4 Jan 2017 17:24:33 +0000 (12:24 -0500)
commit67958f35e80af425c08fa367e8a6f1eeefb830bc
treebbf7964688d1e6fa0524a0aeb5c4dd75a1fc10ac
parentc4867cfedb6235708967aa8518c59ffed2816f0b
Merge conflict
js/src/dropdown.js