Merge pull request #11 from CyberSource/master

brianmc · brianmc · commit ad90cd4583d7 · 2014-12-30T14:04:09.000-08:00
Syncing Master changes into future
diff --git a/README.md b/README.md
@@ -2,6 +2,8 @@
 
 This is the PHP client for the [CyberSource SOAP Toolkit API](http://www.cybersource.com/developers/getting_started/integration_methods/soap_toolkit_api).
 
+[![Build Status](https://travis-ci.org/CyberSource/cybersource-sdk-php.png?branch=master)]
+(https://travis-ci.org/CyberSource/cybersource-sdk-php)
 
 ##Prerequisites
 
diff --git a/composer.json b/composer.json
@@ -7,7 +7,7 @@
     "api"
   ],
   "homepage": "https://github.com/CyberSource/cybersource-sdk-php",
-  "license": "https://github.com/CyberSource/cybersource-sdk-php/blob/master/LICENSE",
+  "license": "Proprietary",
   "authors": [
     {
       "name": "CyberSource",

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`"api"`
`8`	`8`	`],`
`9`	`9`	`"homepage": "https://github.com/CyberSource/cybersource-sdk-php",`
`10`		`- "license": "https://github.com/CyberSource/cybersource-sdk-php/blob/master/LICENSE",`
	`10`	`+ "license": "Proprietary",`
`11`	`11`	`"authors": [`
`12`	`12`	`{`
`13`	`13`	`"name": "CyberSource",`