diff options
| author | Florian Pritz <bluewind@xinu.at> | 2013-09-22 17:18:48 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2013-09-22 17:18:48 +0200 |
| commit | 9538bea0908c8a3758b41967d977455af731c344 (patch) | |
| tree | 5f805a22f77debba76bcd8517885c886ba26c449 /application/views/footer.php | |
| parent | 3ec93bf546c4cfff82f1fb34eeae1f18319c59c1 (diff) | |
| parent | e484fbe3e012a57c95963c24db190c91575e1bc5 (diff) | |
Merge branch 'working-split/bootstrap3' into working
Diffstat (limited to 'application/views/footer.php')
| -rw-r--r-- | application/views/footer.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/application/views/footer.php b/application/views/footer.php index a61e690cc..e748cd4e3 100644 --- a/application/views/footer.php +++ b/application/views/footer.php @@ -26,7 +26,7 @@ if ($CI->config->item("environment") == "development" && property_exists($CI, "e ?> <?php echo include_js("/data/js/jquery-2.0.3.min.js"); ?> <?php echo include_js("/data/js/jquery-ui-1.10.3.custom.min.js"); ?> -<?php echo include_js("/data/js/bootstrap-2.3.2.min.js"); ?> +<?php echo include_js("/data/js/bootstrap.min.js"); ?> <?php echo include_js("/data/js/script.js"); ?> <?php echo include_registered_js(); ?> </body> |