Merge pull request reactjs#1267 from bvaughn/coc-and-readme-license

Add license to README and add standard FB COC
rachelnabors · Oct 16, 2018 · f0ad713 · f0ad713
2 parents e2ee6b9 + 505260d
commit f0ad713
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -0,0 +1,5 @@
+# Code of Conduct
+
+Facebook has adopted a Code of Conduct that we expect project participants to adhere to.
+Please read the [full text](https://code.fb.com/codeofconduct/)
+so that you can understand what actions will and will not be tolerated.
diff --git a/README.md b/README.md
@@ -64,3 +64,6 @@ If you are interesting in translating `reactjs.org`, please join the Crowdin.
 ## Troubleshooting
 
 - `yarn reset` to clear the local cache
+
+## License
+Content submitted to [reactjs.org](https://reactjs.org/) is CC-BY-4.0 licensed, as found in the `LICENSE-DOCS.md` file.