diff options
author | Todd Leonhardt <todd.leonhardt@gmail.com> | 2020-01-09 22:45:53 -0500 |
---|---|---|
committer | Todd Leonhardt <todd.leonhardt@gmail.com> | 2020-01-09 22:45:53 -0500 |
commit | 591bd29cb4a3bcb9b1f40ffc1f30429c6501ebdb (patch) | |
tree | 46c1e3af762c9cb222c6ae90bf0446d6eca4b388 /docs/copyright.rst | |
parent | 10b844809e3a9500274dc4af4e780708975ba905 (diff) | |
parent | d4556962799e68ea4d54ff86186428d17edcaef9 (diff) | |
download | cmd2-git-591bd29cb4a3bcb9b1f40ffc1f30429c6501ebdb.tar.gz |
Merge branch 'master' into generating_output_docs
# Conflicts:
# docs/features/generating_output.rst
# docs/features/settings.rst
Diffstat (limited to 'docs/copyright.rst')
-rw-r--r-- | docs/copyright.rst | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/docs/copyright.rst b/docs/copyright.rst index b7183e62..30cf255c 100644 --- a/docs/copyright.rst +++ b/docs/copyright.rst @@ -1,7 +1,6 @@ Copyright ========= -The ``cmd2`` documentation is Copyright 2010-2019 by the `cmd2 contributors +The ``cmd2`` documentation is Copyright 2010-2020 by the `cmd2 contributors <https://github.com/python-cmd2/cmd2/graphs/contributors>`_ and is licensed -under a `Creative Commons Attribution 4.0 International License -<http://creativecommons.org/licenses/by/4.0/>`_. +under an `MIT License <https://github.com/python-cmd2/cmd2/blob/master/LICENSE>`_. |