This repository was archived by the owner on Sep 16, 2021. It is now read-only.

Commit c5a017b

authored

Merge branch 'master' into master

2 parents 2c266eb + 3a0b3cb commit c5a017bCopy full SHA for c5a017b

File tree

-1

lines changed

-1

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -224,4 +224,6 @@ kubectl create -f deployment.yaml`
`224`	`224`	`* Kubernetes on IBM Cloud: Deliver your apps with the combined power of [Kubernetes and Docker on IBM Cloud](https://www.ibm.com/cloud/container-service)`
`225`	`225`
`226`	`226`	`# License`
`227`		`-[Apache 2.0](LICENSE)`
	`227`	`+This code pattern is licensed under the Apache Software License, Version 2. Separate third party code objects invoked within this code pattern are licensed by their respective providers pursuant to their own separate licenses. Contributions are subject to the [Developer Certificate of Origin, Version 1.1 (DCO)](https://developercertificate.org/) and the [Apache Software License, Version 2](http://www.apache.org/licenses/LICENSE-2.0.txt).`
	`228`	`+`
	`229`	`+[Apache Software License (ASL) FAQ](http://www.apache.org/foundation/license-faq.html#WhatDoesItMEAN)`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,9 @@`
`38`	`38`	`"react-router": "^3.0.2",`
`39`	`39`	`"redux": "^3.5.2"`
`40`	`40`	`},`
	`41`	`+ "jest": {`
	`42`	`+ "testURL": "http://localhost/"`
	`43`	`+ },`
`41`	`44`	`"scripts": {`
`42`	`45`	`"build-css": "node-sass src/ -o src/",`
`43`	`46`	`"watch-css": "npm run build-css && node-sass src/ -o src/ --watch --recursive",`

Comments

(0)