diff options
| author | Mark Otto <[email protected]> | 2014-12-11 12:07:09 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-12-11 12:07:09 -0800 |
| commit | 2edc779391cf5da664e6a7edb3c4b1f736a8b3f3 (patch) | |
| tree | d4218beb3e45c77d4b505a50da72179baaa90773 /docs/extend | |
| parent | 2a78159a2058b9dcfae208df85de672ce45436d5 (diff) | |
| parent | f7e103a6ac4163b301f772b186c04692f8810884 (diff) | |
| download | bootstrap-2edc779391cf5da664e6a7edb3c4b1f736a8b3f3.tar.xz bootstrap-2edc779391cf5da664e6a7edb3c4b1f736a8b3f3.zip | |
Merge branch 'v4' into scss-lint
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
scss/_card.scss
Diffstat (limited to 'docs/extend')
| -rw-r--r-- | docs/extend/approach.md | 5 | ||||
| -rw-r--r-- | docs/extend/icon-fonts.md | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/docs/extend/approach.md b/docs/extend/approach.md new file mode 100644 index 000000000..8374fc04e --- /dev/null +++ b/docs/extend/approach.md @@ -0,0 +1,5 @@ +--- +layout: page +title: Approach +--- + diff --git a/docs/extend/icon-fonts.md b/docs/extend/icon-fonts.md new file mode 100644 index 000000000..6bb47dbf7 --- /dev/null +++ b/docs/extend/icon-fonts.md @@ -0,0 +1,5 @@ +--- +layout: page +title: Icon fonts +--- + |