mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-02 16:04:07 +03:00
Code Activity

Merge branch 'master' into derp

Browse Source 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/_includes/customizer-variables.html
	docs/_includes/js/overview.html
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/browser-bugs.html
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	less/carousel.less
This commit is contained in:
Mark Otto
2014-08-04 15:09:23 -07:00
parent 9e92b74aa3 9096c20021
commit 724240fe4f
15 changed files with 647 additions and 1769 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.json
+1
View File
@@ -52,6 +52,7 @@
"grunt-html-validation": "~0.1.18",
"grunt-jekyll": "~0.4.2",
"grunt-jscs": "~0.6.1",
"grunt-lesslint": "~0.17.0",
"grunt-saucelabs": "~8.2.0",
"grunt-sed": "~0.1.1",
"load-grunt-tasks": "~0.6.0",