Merge branch 'master' of https://github.com/teabreakninja/Cloudlog

Conflicts: application/views/awards/dxcc/details.php
2016-02-17 15:15:26 +00:00 · 2016-02-17 15:15:26 +00:00 · e1ebf7b00f
--- a/.gitignore
+++ b/.gitignore
@ -5,4 +5,4 @@
 /uploads/*.tq8
 /uploads/*.TQ8
 /install/*
-/updates/*
+/updates/*
--- a/application/views/awards/dxcc/details.php
+++ b/application/views/awards/dxcc/details.php
@ -37,4 +37,4 @@

 	<h3>Filtering on <?php echo $filter ?></h3>
 	
-	<?php $this->load->view('view_log/partial/log') ?>
+	<?php $this->load->view('view_log/partial/log') ?>