aboutsummaryrefslogtreecommitdiff
path: root/README.md
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 /README.md
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 'README.md')
-rw-r--r--README.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/README.md b/README.md
index 1f027087a..cc3d5b1a7 100644
--- a/README.md
+++ b/README.md
@@ -131,4 +131,4 @@ See [the Releases section of our GitHub project](https://github.com/twbs/bootstr
## Copyright and license
-Code and documentation copyright 2011-2016 Twitter, Inc. Code released under [the MIT license](https://github.com/twbs/bootstrap/blob/master/LICENSE). Docs released under [Creative Commons](https://github.com/twbs/bootstrap/blob/master/docs/LICENSE).
+Code and documentation copyright 2011-2016 the Bootstrap Authors and Twitter, Inc. Code released under [the MIT license](https://github.com/twbs/bootstrap/blob/master/LICENSE). Docs released under [Creative Commons](https://github.com/twbs/bootstrap/blob/master/docs/LICENSE).