blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-23 18:02:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci

Browse Source 
Conflicts:
	application/views/templates/footer.php
	application/views/templates/header.php
This commit is contained in:
Paminger
2016-06-21 11:28:46 +02:00
parent dbe19fafb5 6dc145d618
commit 6e62fbdcd4
9 changed files with 462 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/templates/header.php
+1
View File
@@ -57,5 +57,6 @@ if ($tablesort)
<link rel="stylesheet" href="<?php echo base_url('vendor/json-forms/dist/css/brutusin-json-forms.min.css'); ?>"/>
<script src="<?php echo base_url('vendor/json-forms/dist/js/brutusin-json-forms.min.js'); ?>"></script>
<?php endif ?>
</head>