Merge branch 'develop'

bgaillard · bgaillard · commit a95c10efe1aa · 2015-10-19T14:56:53.000+02:00
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,15 @@
+/.settings export-ignore
+/src/test export-ignore
+/.buildpath export-ignore
+/.coveralls.yml export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.project export-ignore
+/.travis.yml export-ignore
+/code-climate-test-reporter export-ignore
+/composer.lock export-ignore
+/Gruntfile.js export-ignore
+/package.json export-ignore
+/phpunit.xml export-ignore
+
+* text eol=lf
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
 	"name" : "gomoob/php-pushwoosh",
 	"description" : "A PHP Library to easily work with the Pushwoosh REST Web Services.",
-	"version" : "1.0.7",
+	"version" : "1.0.8",
 	"license" : "MIT",
 	"type" : "library",
 	"keywords" : [
diff --git a/composer.lock b/composer.lock
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gomoob-php-pushwoosh",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "license": "MIT",
   "repository" : {
     "type" : "git",

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name" : "gomoob/php-pushwoosh",`
`3`	`3`	`"description" : "A PHP Library to easily work with the Pushwoosh REST Web Services.",`
`4`		`- "version" : "1.0.7",`
	`4`	`+ "version" : "1.0.8",`
`5`	`5`	`"license" : "MIT",`
`6`	`6`	`"type" : "library",`
`7`	`7`	`"keywords" : [`