Merge branch '2.0-Development' into Master

RetinaInc · Dec 30, 2013 · e3b4e0b · e3b4e0b
2 parents 4810e57 + 00698f8
commit e3b4e0b
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,14 @@
+<<<<<<< HEAD
+Version 2.3.3
+-------------
+	Release date: December 30, 2013
+
+	Bug Fix
+
+		- Fixed locations controller to have DB access.
+
+=======
+>>>>>>> 60f0421e22a56876792604c16c432699bc8bee5f
 Version 2.3.2
 -------------
 	Release date: December 18, 2013
@@ -88,12 +99,21 @@ Version 2.2.1
 	Bug Fix
 
 		- Fixed PHP syntax error in Go_cart.php library
+<<<<<<< HEAD
+
+
+Version 2.2
+-------------
+	Release date: January 23, 2013
+
+=======
 
 
 Version 2.2
 -------------
 	Release date: January 23, 2013
 
+>>>>>>> 60f0421e22a56876792604c16c432699bc8bee5f
 	Features
 
 		- Replaced experimental "GoEdit" with RedactorJS (RedactorJS is distributable with GoCart but NOT OPEN SOURCE http://imperavi.com/redactor/).

diff --git a/gocart/controllers/locations.php b/gocart/controllers/locations.php
@@ -1,6 +1,6 @@
 <?php
 
-class Locations extends CI_Controller {	
+class Locations extends Base_Controller {	
 
 	function __construct()
 	{		

diff --git a/version b/version
@@ -1 +1,5 @@
-2.3.2
+<<<<<<< HEAD
+2.3.3
+=======
+2.3.2
+>>>>>>> 60f0421e22a56876792604c16c432699bc8bee5f