git.ipfire.org Git - thirdparty/bootstrap.git/commit

]> git.ipfire.org Git - thirdparty/bootstrap.git/commit

Merge branch 'master' into document_popover_focus

Conflicts:
docs/assets/js/docs.min.js

Mirror of https://github.com/twbs/bootstrap.git

dist/css/bootstrap-theme.css.map	diff1 \|	diff2 \|	blob \| history
dist/css/bootstrap.css.map	diff1 \|	diff2 \|	blob \| history
docs/assets/js/application.js	diff1 \|	diff2 \|	blob \| history
docs/assets/js/docs.min.js	diff1 \|	diff2 \|	blob \| history
docs/dist/css/bootstrap-theme.css.map	diff1 \|	diff2 \|	blob \| history
docs/dist/css/bootstrap.css.map	diff1 \|	diff2 \|	blob \| history
docs/javascript.html	diff1 \|	diff2 \|	blob \| history