mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-27 14:46:01 +03:00
Code Activity

Merge branch 'master' into docs_derp

Browse Source 
Conflicts:
	docs/assets/css/docs.css
This commit is contained in:
Mark Otto
2014-01-09 20:33:55 -08:00
parent 04161a8c75 7f153974e1
commit ea20f44815
65 changed files with 2742 additions and 1919 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/_includes/customizer-variables.html
+1682
View File
File diff suppressed because it is too large Load Diff
docs/_includes/footer.html
+1 -1
View File
@@ -36,7 +36,7 @@
{% if page.slug == "customize" %}
<script src="{{ site.baseurl }}assets/js/raw-files.js"></script>
<script src="{{ site.baseurl }}assets/js/customize.js"></script>
<script src="{{ site.baseurl }}assets/js/customize.min.js"></script>
{% endif %}
{% comment %}