Mark Otto 5c4c7eba54 Merge branch 'master' of https://github.com/nuttertag/bootstrap into nuttertag-master ...

Conflicts:
	dist/css/bootstrap.min.css

2013-09-06 09:23:49 -07:00

..

css

Merge branch 'master' of https://github.com/nuttertag/bootstrap into nuttertag-master

2013-09-06 09:23:49 -07:00

fonts

Upgrade to latest glyphicons

2013-08-18 01:46:26 -07:00

js

Use jekyll var for current version in docs; update banner in gruntfile to match .less banner

2013-08-23 22:38:51 -07:00