diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-12-06 04:54:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-12-06 04:54:36 +0000 |
| commit | cf7ad2db7a8fa4912a5c254eac68df4f534150ae (patch) | |
| tree | 729a4354acf7d71d9597c3ae2dbc6265dd17b08b /README.rst | |
| parent | 68d8866f049662a23bb1d8844e24e22847854fb4 (diff) | |
| parent | 45d20193b70b3c51aefc41baafdbc63d3dc39e2a (diff) | |
| download | kolla-cf7ad2db7a8fa4912a5c254eac68df4f534150ae.tar.gz kolla-cf7ad2db7a8fa4912a5c254eac68df4f534150ae.zip | |
Merge "Follow Docker Inc's trademark guidelines"
Diffstat (limited to 'README.rst')
| -rw-r--r-- | README.rst | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/README.rst b/README.rst index a3faa1f30..da4926b21 100644 --- a/README.rst +++ b/README.rst @@ -170,3 +170,10 @@ Check out who is `contributing code <http://stackalytics.com/?module=kolla-group&metric=commits>`__ and `contributing reviews <http://stackalytics.com/?module=kolla-group&metric=marks>`__. + +Notices +======= + +Docker and the Docker logo are trademarks or registered trademarks of +Docker, Inc. in the United States and/or other countries. Docker, Inc. +and other parties may also have trademark rights in other terms used herein. |