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

Merge branch 'master' into docs_derp

Conflicts:
	docs/assets/css/docs.css
This commit is contained in:
Mark Otto
2014-01-09 20:33:55 -08:00
65 changed files with 2742 additions and 1919 deletions
+1 -1
View File
@@ -3,7 +3,7 @@
// ++++++++++++++++++++++++++++++++++++++++++
/*!
* Copyright 2013 Twitter, Inc.
* 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/.