Mark Otto 663576a7ae Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 ... Conflicts: dist/css/bootstrap.css dist/css/bootstrap.css.map docs/assets/css/docs.min.css		2015-05-27 15:49:55 -07:00
..
brand	cleanup svg	2014-03-24 23:57:38 -07:00
css	Merge branch 'v4' of https://github.com/twbs/derpstrap into v4	2015-05-27 15:49:55 -07:00
flash	Update ZeroClipboard to v1.3.5.	2014-06-10 08:30:17 +03:00
img	Docs: losslessly compress images.	2014-02-04 11:33:28 +02:00
js	Merge branch 'v4' of https://github.com/twbs/derpstrap into v4	2015-05-27 15:49:55 -07:00
scss	button alignment in nav	2015-05-22 22:33:58 -07:00