]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'twbs/v4-dev' into dropdown-keyboard
authorPierre-Denis Vanduynslager <pierre.denis.vanduynslager@gmail.com>
Wed, 4 Jan 2017 17:22:06 +0000 (12:22 -0500)
committerPierre-Denis Vanduynslager <pierre.denis.vanduynslager@gmail.com>
Wed, 4 Jan 2017 17:22:06 +0000 (12:22 -0500)
commitc4867cfedb6235708967aa8518c59ffed2816f0b
treec7be6d18ee7c7a61f319bccacc035b9952171db1
parent425d156df27fa6c18e979aa000bfe5a346ee3450
parent1b194c06607f6cc3d087d25d6d49e1698771f3a1
Merge branch 'twbs/v4-dev' into dropdown-keyboard

# Conflicts:
# js/src/dropdown.js
js/src/dropdown.js