diff options
| author | Mark Otto <[email protected]> | 2013-11-30 00:26:53 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-11-30 00:26:53 -0800 |
| commit | bb4a39d51cd644b212323a7e36f0b5af2682d0ca (patch) | |
| tree | 60ae6687f516cea501f32f5623a5c0aacb950772 /docs-assets/js/application.js | |
| parent | 96109d3138fd6f5b67fb1108754e81c077630b36 (diff) | |
| parent | e6eb798178529cf58fab3f33446c0170bae7bdea (diff) | |
| download | bootstrap-bb4a39d51cd644b212323a7e36f0b5af2682d0ca.tar.xz bootstrap-bb4a39d51cd644b212323a7e36f0b5af2682d0ca.zip | |
Merge branch 'master' into pr/11388
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'docs-assets/js/application.js')
| -rw-r--r-- | docs-assets/js/application.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs-assets/js/application.js b/docs-assets/js/application.js index 72d4cd16b..f5c0556dc 100644 --- a/docs-assets/js/application.js +++ b/docs-assets/js/application.js @@ -100,4 +100,4 @@ }) }) -}(window.jQuery) +}(jQuery) |