Merge branch 'PatchworkBoy-patch-1' into develop

This commit is contained in:
alext 2017-07-15 17:14:22 +02:00
commit 565332995f

View file

@ -14,6 +14,9 @@
<script
type="text/javascript"
src="<?php echo base_url('assets/ext/bootstrap/js/bootstrap.min.js'); ?>"></script>
<script
type="text/javascript"
src="<?php echo base_url('assets/ext/jquery-ui/jquery-ui.min.js'); ?>"></script>
<script
type="text/javascript"
src="<?php echo base_url('assets/ext/datejs/date.js'); ?>"></script>
@ -27,6 +30,10 @@
rel="stylesheet"
type="text/css"
href="<?php echo base_url('assets/ext/bootstrap/css/bootstrap.min.css'); ?>">
<link
rel="stylesheet"
type="text/css"
href="<?php echo base_url('assets/ext/jquery-ui/jquery-ui.min.css'); ?>">
<?php // SET FAVICON FOR PAGE ?>
<link