2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00

Merge branch '3.0.0-wip' into bs3_homepage

Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2013-08-17 22:39:07 -07:00
63 changed files with 3035 additions and 3085 deletions
-1
View File
@@ -13,7 +13,6 @@
<script src="{{ page.base_url }}assets/js/less.js"></script>
<script src="{{ page.base_url }}assets/js/jszip.js"></script>
<script src="{{ page.base_url }}assets/js/uglify.js"></script>
<script src="{{ page.base_url }}assets/js/jquery.bbq.min.js"></script>
<script src="{{ page.base_url }}assets/js/customizer.js"></script>
{% endif %}