summaryrefslogtreecommitdiffstats
path: root/DCO.txt
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2012-07-04 16:12:26 +0200
committerDerek Jones <derek.jones@ellislab.com>2012-07-04 16:12:26 +0200
commit36d1ac94a8b55485db30677a72bc3d57c3bb3cf8 (patch)
treea51308f576cc05cba9b5477d6eba9bbd192654a7 /DCO.txt
parent6801d044d7f7b905e1fdaf21231f8a3fad5b4057 (diff)
parent1a85653e093d0f9b4028d808b57747cdbff17a65 (diff)
Merge branch 'feature/user-guide-work' into develop
Conflicts: user_guide_src/source/installation/upgrade_210.rst user_guide_src/source/installation/upgrade_211.rst user_guide_src/source/installation/upgrade_212.rst
Diffstat (limited to 'DCO.txt')
-rw-r--r--DCO.txt25
1 files changed, 25 insertions, 0 deletions
diff --git a/DCO.txt b/DCO.txt
new file mode 100644
index 000000000..a404c0d38
--- /dev/null
+++ b/DCO.txt
@@ -0,0 +1,25 @@
+Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+
+(1) The contribution was created in whole or in part by me and I
+ have the right to submit it under the open source license
+ indicated in the file; or
+
+(2) The contribution is based upon previous work that, to the best
+ of my knowledge, is covered under an appropriate open source
+ license and I have the right under that license to submit that
+ work with modifications, whether created in whole or in part
+ by me, under the same open source license (unless I am
+ permitted to submit under a different license), as indicated
+ in the file; or
+
+(3) The contribution was provided directly to me by some other
+ person who certified (1), (2) or (3) and I have not modified
+ it.
+
+(4) I understand and agree that this project and the contribution
+ are public and that a record of the contribution (including all
+ personal information I submit with it, including my sign-off) is
+ maintained indefinitely and may be redistributed consistent with
+ this project or the open source license(s) involved.