diff options
| author | Pierre-Denis Vanduynslager <[email protected]> | 2017-01-04 12:22:06 -0500 |
|---|---|---|
| committer | Pierre-Denis Vanduynslager <[email protected]> | 2017-01-04 12:22:06 -0500 |
| commit | c4867cfedb6235708967aa8518c59ffed2816f0b (patch) | |
| tree | c7be6d18ee7c7a61f319bccacc035b9952171db1 /docs/examples/grid | |
| parent | 425d156df27fa6c18e979aa000bfe5a346ee3450 (diff) | |
| parent | 1b194c06607f6cc3d087d25d6d49e1698771f3a1 (diff) | |
| download | bootstrap-c4867cfedb6235708967aa8518c59ffed2816f0b.tar.xz bootstrap-c4867cfedb6235708967aa8518c59ffed2816f0b.zip | |
Merge branch 'twbs/v4-dev' into dropdown-keyboard
# Conflicts:
# js/src/dropdown.js
Diffstat (limited to 'docs/examples/grid')
| -rw-r--r-- | docs/examples/grid/index.html | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/docs/examples/grid/index.html b/docs/examples/grid/index.html index 1400bfd9a..4779ebcea 100644 --- a/docs/examples/grid/index.html +++ b/docs/examples/grid/index.html @@ -2,9 +2,7 @@ <html lang="en"> <head> <meta charset="utf-8"> - <meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> - <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags --> <meta name="description" content=""> <meta name="author" content=""> <link rel="icon" href="../../favicon.ico"> |