Conflicts:
	application/views/awards/dxcc/details.php
This commit is contained in:
Andy
2016-02-17 15:15:26 +00:00
2 changed files with 2 additions and 2 deletions

2
.gitignore vendored
View File

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