aboutsummaryrefslogtreecommitdiff
path: root/scss
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-06-02 21:48:53 -0700
committerMark Otto <[email protected]>2016-06-02 21:48:53 -0700
commit8feae9075ae55be4e6cd0e884fbfa006a6639ceb (patch)
tree0124594afc748b650fbe2f840b1e8d4cabc841cf /scss
parent96835e1512631a1a54e99e1179e06d2e23060705 (diff)
parent0b4187d37b8fb1a65a5929329b51b04a2d6aa1eb (diff)
downloadbootstrap-8feae9075ae55be4e6cd0e884fbfa006a6639ceb.tar.xz
bootstrap-8feae9075ae55be4e6cd0e884fbfa006a6639ceb.zip
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
Diffstat (limited to 'scss')
-rw-r--r--scss/bootstrap.scss1
1 files changed, 1 insertions, 0 deletions
diff --git a/scss/bootstrap.scss b/scss/bootstrap.scss
index f99a722ca..7697abb18 100644
--- a/scss/bootstrap.scss
+++ b/scss/bootstrap.scss
@@ -1,5 +1,6 @@
/*!
* Bootstrap v4.0.0-alpha.2 (http://getbootstrap.com)
+ * Copyright 2011-2016 The Bootstrap Authors
* Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/