diff options
| author | Mark Otto <[email protected]> | 2014-01-09 20:33:55 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-09 20:33:55 -0800 |
| commit | ea20f44815b535975d1f1416fee15bd1ea7acdb3 (patch) | |
| tree | edb73c6ae943629dbdc51d3350a50a079f7a2f7e /docs/assets/js/application.js | |
| parent | 04161a8c753c5f9ef83dd1f0848a17e8c4ab155c (diff) | |
| parent | 7f153974e10980dccbdd485e63941b591e925148 (diff) | |
| download | bootstrap-ea20f44815b535975d1f1416fee15bd1ea7acdb3.tar.xz bootstrap-ea20f44815b535975d1f1416fee15bd1ea7acdb3.zip | |
Merge branch 'master' into docs_derp
Conflicts:
docs/assets/css/docs.css
Diffstat (limited to 'docs/assets/js/application.js')
| -rw-r--r-- | docs/assets/js/application.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index 6d47db680..54eeaceb2 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -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/. |