Merge branch 'master' into derp
Conflicts: dist/css/bootstrap.css.map dist/css/bootstrap.min.css docs/_includes/components/navs.html docs/_includes/css/images.html docs/_includes/js/dropdowns.html docs/_includes/js/tabs.html docs/assets/css/docs.min.css docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css
Showing
+781 -1972
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
Please register or sign in to comment