mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-25 21:09:06 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into docs_derp

Browse Source 
Conflicts:
	docs/assets/css/pack.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/docs.min.js
This commit is contained in:
Mark Otto
2014-01-13 22:43:18 -08:00
parent b17dca240e 8c0cb806c6
commit eca81939cc
15 changed files with 168 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/assets/js/application.js
View File

@@ -3,8 +3,8 @@
// ++++++++++++++++++++++++++++++++++++++++++
/*!
* JavaScript for Bootstrap's docs (http://getbootstrap.com)
* Copyright 2011-2014 Twitter, Inc.
*
* Licensed under the Creative Commons Attribution 3.0 Unported License. For
* details, see http://creativecommons.org/licenses/by/3.0/.
*/