Merge branch 'release/1.0.6'

Stefano Azzolini · Stefano Azzolini · commit 4567b829f8b8 · 2014-11-17T18:56:52.000+01:00
Signed-off-by: Stefano Azzolini &lt;stefano.azzolini@caffeinalab.com&gt;

Conflicts:
	composer.json
diff --git a/composer.json b/composer.json
@@ -4,7 +4,7 @@
     "description": "API extensions for Caffeina Core",
     "keywords": ["core","api","rest","server"],
     "homepage": "http://labs.caffeina.co/tech/core",
-    "version": "1.0.5",
+    "version": "1.0.6",
     "license": "MIT",
     "authors": [
         {

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`"description": "API extensions for Caffeina Core",`
`5`	`5`	`"keywords": ["core","api","rest","server"],`
`6`	`6`	`"homepage": "http://labs.caffeina.co/tech/core",`
`7`		`- "version": "1.0.5",`
	`7`	`+ "version": "1.0.6",`
`8`	`8`	`"license": "MIT",`
`9`	`9`	`"authors": [`
`10`	`10`	`{`