Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	application/views/awards/dxcc/details.php
This commit is contained in:
Andy
2016-02-17 15:15:26 +00:00
parent 71586bb1e5 70a59457a3
commit e1ebf7b00f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -5,4 +5,4 @@
/uploads/*.tq8 /uploads/*.tq8
/uploads/*.TQ8 /uploads/*.TQ8
/install/* /install/*
/updates/* /updates/*

2
application/views/awards/dxcc/details.php
View File

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