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

Merge branch 'master' into docs_derp

Browse Source 
Conflicts:
	docs/_includes/footer.html
	docs/assets/css/docs.css
This commit is contained in:
Mark Otto
2014-01-01 12:27:09 -08:00
parent bab240252a c583b79655
commit 70459c1454
46 changed files with 107 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/js/customize.js
+1 -1
View File
@@ -1,6 +1,6 @@
/*!
* Bootstrap Docs (http://getbootstrap.com)
* Copyright 2013 Twitter, Inc.
* Copyright 2014 Twitter, Inc.
* Licensed under the Creative Commons Attribution 3.0 Unported License. For
* details, see http://creativecommons.org/licenses/by/3.0/.
*/
docs/assets/js/raw-files.js
+1 -1
View File
File diff suppressed because one or more lines are too long