Merge remote-tracking branch 'origin/develop' into develop

stiv-pro · stiv-pro · commit b85d72a8cf2a · 2018-05-21T10:23:28.000+02:00
diff --git a/composer.json b/composer.json
@@ -37,6 +37,6 @@
     "slim/slim": "3.*"
   },
   "conflict": {
-    "wollanup/php-api-rest": "<3.0"
+    "wollanup/php-api-rest-swagger": "<0.1"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,6 @@`
`37`	`37`	`"slim/slim": "3.*"`
`38`	`38`	`},`
`39`	`39`	`"conflict": {`
`40`		`- "wollanup/php-api-rest": "<3.0"`
	`40`	`+ "wollanup/php-api-rest-swagger": "<0.1"`
`41`	`41`	`}`
`42`	`42`	`}`