Merge branch 'hotfix/1.1.6'

mikedfunk · Mar 4, 2012 · 4e3f2c1 · 4e3f2c1
2 parents a932753 + a5af577
commit 4e3f2c1
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ Setup
 2. [Install this spark](http://getsparks.org/packages/ci_authentication/versions/HEAD/show)
 2. Edit **config/ci_authentication.php** with the proper stuff like redirect urls, etc.
 3. Import **setup.sql** in PHPMyAdmin or something
-4. Load the spark: ```$this->load->spark('ci_authentication/1.1.5');```
+4. Load the spark: ```$this->load->spark('ci_authentication/1.1.6');```
 5. Load the library: ```$this->load->library('ci_authentication');```
 
 *NOTE: If cloning this directly, be sure to also clone [CI Alerts](https://github.com/mikedfunk/CI-Alerts) version 1.1.2 as a spark and load it. CI Alerts are required for CI Authentication. The spark format requires this already as a dependency.*

diff --git a/config/ci_authentication.php b/config/ci_authentication.php
@@ -10,7 +10,7 @@
  * @email		mike@mikefunk.com
  * 
  * @file		ci_authentication.php
- * @version		1.1.5
+ * @version		1.1.6
  * @date		02/17/2012
  * 
  * Copyright (c) 2012

diff --git a/helpers/ci_authentication_helper.php b/helpers/ci_authentication_helper.php
@@ -10,7 +10,7 @@
  * @email		mike@mikefunk.com
  * 
  * @file		ci_authentication_helper.php
- * @version		1.1.5
+ * @version		1.1.6
  * @date		02/17/2012
  * 
  * Copyright (c) 2012

diff --git a/helpers/encrypt_helper.php b/helpers/encrypt_helper.php
@@ -10,7 +10,7 @@
  * @email		mike@mikefunk.com
  * 
  * @file		
- * @version		1.1.5
+ * @version		1.1.6
  * @date		10/14/2011
  * 
  * Copyright (c) 2011

diff --git a/libraries/ci_authentication.php b/libraries/ci_authentication.php
@@ -10,7 +10,7 @@
  * @email		mike@mikefunk.com
  * 
  * @file		ci_authentication.php
- * @version		1.1.5
+ * @version		1.1.6
  * @date		02/17/2012
  * 
  * Copyright (c) 2012

diff --git a/models/ci_authentication_model.php b/models/ci_authentication_model.php
@@ -10,7 +10,7 @@
  * @email		mike@mikefunk.com
  * 
  * @file		ci_authentication_model.php
- * @version		1.1.5
+ * @version		1.1.6
  * @date		02/17/2012
  * 
  * Copyright (c) 2012

diff --git a/spark.info b/spark.info
@@ -7,7 +7,7 @@ name: CI Authentication
 
 # This is the current version of this spark. All sparks should be in
 #  x.x.x format. Validation will fail otherwise.
-version: 1.1.5
+version: 1.1.6
 
 # This is the version of CodeIgniter this spark is compatible up to. It should
 #  be in x.x.x format