Mark Otto 7b4e2a9a4a Merge branch '3.0.0-navbar-default' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-navbar-default ...

Conflicts:
	dist/css/bootstrap.min.css

2013-08-18 15:43:27 -07:00

..

css

Merge branch '3.0.0-navbar-default' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-navbar-default

2013-08-18 15:43:27 -07:00

fonts

Upgrade to latest glyphicons

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

js

add small fix for tooltip consistency + fix customizer syntax issue

2013-08-17 20:28:58 -07:00