diff options
| author | Mark Otto <[email protected]> | 2013-08-17 22:39:07 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-17 22:39:07 -0700 |
| commit | 18766db63423e9151d1be4de061016b7a53ff8a1 (patch) | |
| tree | 07c1170429e6e22caba90d72948460f379d989e3 /_includes | |
| parent | 5e31478a91e62fc022ba0141acf27937c9dd7719 (diff) | |
| parent | 04a73ebe42b8beb9567220fe31cc11057badf40f (diff) | |
| download | bootstrap-18766db63423e9151d1be4de061016b7a53ff8a1.tar.xz bootstrap-18766db63423e9151d1be4de061016b7a53ff8a1.zip | |
Merge branch '3.0.0-wip' into bs3_homepage
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to '_includes')
| -rw-r--r-- | _includes/footer.html | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/_includes/footer.html b/_includes/footer.html index 8898c02e8..bd5a23b2c 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -13,7 +13,6 @@ <script src="{{ page.base_url }}assets/js/less.js"></script> <script src="{{ page.base_url }}assets/js/jszip.js"></script> <script src="{{ page.base_url }}assets/js/uglify.js"></script> -<script src="{{ page.base_url }}assets/js/jquery.bbq.min.js"></script> <script src="{{ page.base_url }}assets/js/customizer.js"></script> {% endif %} |