mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00
Code Activity

Merge branch 'glyphicons_font' into exploratory

Browse Source 
Conflicts:
	docs/assets/css/bootstrap.css
	docs/assets/css/docs.css
	less/sprites.less
This commit is contained in:
Mark Otto
2012-11-03 16:15:54 -07:00
parent c0eacca0db 4b3fb30877
commit a56de2b84f
25 changed files with 1436 additions and 903 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/bootstrap.less
Vendored
+1 -1
View File
@@ -27,7 +27,7 @@
@import "tables.less";
// Components: common
@import "sprites.less";
@import "glyphicons.less";
@import "dropdowns.less";
@import "wells.less";
@import "component-animations.less";