aboutsummaryrefslogtreecommitdiff
path: root/js/src/button.js
diff options
context:
space:
mode:
authorPierre-Denis Vanduynslager <[email protected]>2017-01-04 12:24:33 -0500
committerPierre-Denis Vanduynslager <[email protected]>2017-01-04 12:24:33 -0500
commit67958f35e80af425c08fa367e8a6f1eeefb830bc (patch)
treebbf7964688d1e6fa0524a0aeb5c4dd75a1fc10ac /js/src/button.js
parentc4867cfedb6235708967aa8518c59ffed2816f0b (diff)
downloadbootstrap-67958f35e80af425c08fa367e8a6f1eeefb830bc.tar.xz
bootstrap-67958f35e80af425c08fa367e8a6f1eeefb830bc.zip
Merge conflict
Diffstat (limited to 'js/src/button.js')
0 files changed, 0 insertions, 0 deletions