Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2025-01-03 06:28:06 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
kunw 2016-04-01 15:35:55 +08:00
commit 649607bd18
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
AUTHORS
View File

@ -1,15 +1,16 @@
# This file lists all individuals having contributed content to the repository. # This file lists all individuals having contributed content to the repository.
Amanda Zhang <amzhang@vmware.com> Amanda Zhang <amzhang at vmware.com>
Ben Niu Ji <benniuji@gmail.com> Benniu Ji <benniuji at gmail.com>
Bobby Zhang <junzhang@vmware.com> Bobby Zhang <junzhang at vmware.com>
Daniel Jiang <jiangd@vmware.com> Chaofeng Wu <chaofengw at vmware.com>
Haining Henry Zhang <henryzhang@vmware.com> Daniel Jiang <jiangd at vmware.com>
Hao Xia <haox@vmware.com> Haining Henry Zhang <henryzhang at vmware.com>
Jack Liu <ljack@vmware.com> Hao Xia <haox at vmware.com>
Kun Wang <kunw@vmware.com> Jack Liu <ljack at vmware.com>
Shan Zhu <zhus@vmware.com> Kun Wang <kunw at vmware.com>
Victoria Zheng <vzheng@vmware.com> Shan Zhu <zhus at vmware.com>
Wenkai Yin <yinw@vmware.com> Victoria Zheng <vzheng at vmware.com>
Yan Wang <wangyan@vmware.com> Wenkai Yin <yinw at vmware.com>
Yan Wang <wangyan at vmware.com>

2
README.md
View File

@ -57,7 +57,7 @@ To simplify the installation process, a pre-built installation package of Harbor
For information on how to use Harbor, please see [User Guide](docs/user_guide.md) . For information on how to use Harbor, please see [User Guide](docs/user_guide.md) .
### Contribution ### Contribution
We welcome contributions from the community. If you wish to contribute code, we require that you first sign our [Contributor License Agreement](https://vmware.github.io/photon/assets/files/vmware_cla.pdf) and return a copy to osscontributions@vmware.com before we can merge your contribution. We welcome contributions from the community. If you wish to contribute code and you have not signed our contributor license agreement (CLA), our bot will update the issue when you open a pull request. For any questions about the CLA process, please refer to our [FAQ](https://cla.vmware.com/faq).
### License ### License
Harbor is available under the [Apache 2 license](LICENSE). Harbor is available under the [Apache 2 license](LICENSE).