2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-14 18:42:30 +03:00

Merge branch '3.0.0-wip' into bs3_homepage

Conflicts:
	customize.html
	examples/justified-nav/justified-nav.css
This commit is contained in:
Mark Otto
2013-08-18 19:02:42 -07:00
59 changed files with 3196 additions and 417 deletions
-3
View File
@@ -15,9 +15,6 @@ repo: https://github.com/twbs/bootstrap
download: https://github.com/twbs/bootstrap/archive/v3.0.0.zip
download_dist: https://github.com/twbs/bootstrap/releases/download/v3.0.0/bootstrap-3.0.0-dist.zip
glyphicons: http://glyphicons.getbootstrap.com
glyphicons_repo: https://github.com/twbs/bootstrap-glyphicons
blog: http://blog.getbootstrap.com
expo: http://expo.getbootstrap.com