From 1e6fd70cdf847f235af9d34b7789640e22097ec6 Mon Sep 17 00:00:00 2001
From: Daniel Dimitrov <daniel@compojoom.com>
Date: Mon, 26 Oct 2015 10:11:09 +0100
Subject: [PATCH] updating changelog

---
 CHANGELOG | 37 ++++++++++++++++++++++++++++++-------
 1 file changed, 30 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index c967504..43338b4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,30 @@
-Changelog:
-
-~ code cleaup and joomla's phpcs compatibility (at least for the rules)
-# Fixed unnecessary GPL checks in php files with no code - thanks to Peter van Westen
-# Fixed unnecessary JEXEC checks in php files with no code - thanks to Peter van Westen
-+ added rule to check for error_reporting(0) - thanks to Denis Delici
-# JFile not found
\ No newline at end of file
+<?php defined('_JEXEC') or die(); ?>
+
+=====================================================================
+Hotspots 1.6 - Released 26-October-2015
+=====================================================================
+~ phpcs
+# uploading zip files no longer displays a warning on j 3.4.4
+# updated link to JED listing requirements
++ added rule framework, jamss
+
+=====================================================================
+Hotspots 1.6 - Released 5-November-2015
+=====================================================================
+~ code cleaup and joomla's phpcs compatibility (at least for the rules)
+# Fixed unnecessary GPL checks in php files with no code - thanks to Peter van Westen
+# Fixed unnecessary JEXEC checks in php files with no code - thanks to Peter van Westen
++ added rule to check for error_reporting(0) - thanks to Denis Delici
+# JFile not found
+
+=====================================================================
+LEGEND
+=====================================================================
+! Note
++ New feature or addition
+^ Major change
+~ Small change
+$ Language change
+* Security fix
+# Bug fix
+- Feature removal
\ No newline at end of file