0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-10 22:24:19 +01:00
Commit Graph

155 Commits

Author SHA1 Message Date
Mark Otto
0e371ddf87 Merge branch 'v4' of https://github.com/twbs/derpstrap into v4
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/css/docs.min.css.map
2014-12-10 20:51:17 -08:00
Mark Otto
63d4423fc0 grunt 2014-12-10 13:49:53 -08:00
Mark Otto
8ef926b4fb clean up some docs css 2014-12-06 00:20:57 -08:00
Mark Otto
57071cc68a grunt--fuuuuuuuuuuuuuck you line comments 2014-12-05 14:56:29 -08:00
Mark Otto
27df020852 convert to scss 2014-12-02 14:02:35 -08:00