Merge 2d5faa7 into 2329b09

zalando-incubator · Sep 22, 2017 · da7138a · da7138a
2 parents 2329b09 + 2d5faa7
commit da7138a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -32,6 +32,8 @@ This is a rough outline of what the workflow for code contributions looks like:
 - Submit a pull request to [zalando-incubator/tessellate](https://github.com/zalando-incubator/tessellate)
 - Your pull request must receive a :thumbsup: from at least one [maintainer](https://github.com/zalando-incubator/tessellate/blob/master/MAINTAINERS)
 
+Unless you explicitly state otherwise in advance, any non trivial contribution intentionally submitted for inclusion in this project by you to the steward of this repository (Zalando SE, Berlin) shall be under the terms and conditions of the [MIT License](LICENSE), without any additional copyright information, terms or conditions.
+
 Thanks for your contributions!
 
 ### Commit messages

diff --git a/README.md b/README.md
@@ -55,8 +55,12 @@ apm install nuclide
 npm install -g flow-bin
 ```
 
+## Contributing
+
 For details on pull requests, commit messages and contributing please see [CONTRIBUTING.md](CONTRIBUTING.md)
 
+Unless you explicitly state otherwise in advance, any non trivial contribution intentionally submitted for inclusion in this project by you to the steward of this repository (Zalando SE, Berlin) shall be under the terms and conditions of the [MIT License](LICENSE), without any additional copyright information, terms or conditions.
+
 ## Documentation
 
 Go to [zalando-incubator.github.io/tessellate](https://zalando-incubator.github.io/tessellate) for detailed documentation.