Commit 4037a778 authored by Jaime Martinez's avatar Jaime Martinez 🔴
Browse files

Merge branch 'update-CONTRIBUTING.md-LICENSE' into 'master'

Update CONTRIBUTING.md and LICENSE

See merge request !187



Merged-by: default avatarJaime Martinez <jmartinez@gitlab.com>
Approved-by: Timo Furrer's avatarTimo Furrer <tfurrer@gitlab.com>
Approved-by: default avatarJaime Martinez <jmartinez@gitlab.com>
Co-authored-by: default avatarLin Jen-Shin <jen-shin@gitlab.com>
parents 679f70d0 4531015d
Loading
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
## Developer Certificate of Origin + License

By contributing to GitLab B.V., You accept and agree to the following terms and
conditions for Your present and future Contributions submitted to GitLab B.V.
Except for the license granted herein to GitLab B.V. and recipients of software
distributed by GitLab B.V., You reserve all right, title, and interest in and to
By contributing to GitLab Inc., You accept and agree to the following terms and
conditions for Your present and future Contributions submitted to GitLab Inc.
Except for the license granted herein to GitLab Inc. and recipients of software
distributed by GitLab Inc., You reserve all right, title, and interest in and to
Your Contributions. All Contributions are subject to the following DCO + License
terms.

+1 −1
Original line number Diff line number Diff line
The MIT License (MIT)

Copyright (c) 2015-present GitLab B.V.
Copyright (c) 2015-present GitLab Inc.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal