diff options
| author | Mark Otto <[email protected]> | 2016-10-09 12:40:03 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-10-09 12:40:03 -0700 |
| commit | f49a7a2a0830ced28c5dbd8f94e04ad2f9d7425d (patch) | |
| tree | dcb590b325ff6c49bf52dd4da620a2b92971acdb | |
| parent | a2a53cb8c5174ef713b7dc7633fc6f2d7a468ee5 (diff) | |
| parent | e56146e592804ca2a9a3b37a2d87c1f7eff54676 (diff) | |
| download | bootstrap-f49a7a2a0830ced28c5dbd8f94e04ad2f9d7425d.tar.xz bootstrap-f49a7a2a0830ced28c5dbd8f94e04ad2f9d7425d.zip | |
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | docs/extend/icon-fonts.md | 1 |
2 files changed, 2 insertions, 1 deletions
@@ -132,4 +132,4 @@ See [the Releases section of our GitHub project](https://github.com/twbs/bootstr ## Copyright and 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). +Code and documentation copyright 2011-2016 the [Bootstrap Authors](https://github.com/twbs/bootstrap/graphs/contributors) and [Twitter, Inc.](https://twitter.com) 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). diff --git a/docs/extend/icon-fonts.md b/docs/extend/icon-fonts.md index 9de3cf4ba..9cddafeea 100644 --- a/docs/extend/icon-fonts.md +++ b/docs/extend/icon-fonts.md @@ -3,3 +3,4 @@ layout: docs title: Icon fonts --- +TODO |