diff options
| author | Maurício Meneghini Fauth <mauriciofauth@gmail.com> | 2018-03-28 07:04:49 +0300 |
|---|---|---|
| committer | Maurício Meneghini Fauth <mauriciofauth@gmail.com> | 2018-03-28 07:04:49 +0300 |
| commit | b078e99c950f55650c3b4ff22c07224450c53d24 (patch) | |
| tree | 7c1cac083cea70624d4c937de1524a08aad618cf /doc | |
| parent | 051a77b86bf79bb30068390952c66e1162097bae (diff) | |
| parent | 20407323dd57423e28ddc4e78d07cc375216cae8 (diff) | |
Merge branch 'QA_4_8'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/conf.py | 2 | ||||
| -rw-r--r-- | doc/copyright.rst | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/conf.py b/doc/conf.py index 2e62d91fc8..6402f08ee9 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -44,7 +44,7 @@ master_doc = 'index' # General information about the project. project = u'phpMyAdmin' -copyright = u'2012 - 2017, The phpMyAdmin devel team' +copyright = u'2012 - 2018, The phpMyAdmin devel team' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the diff --git a/doc/copyright.rst b/doc/copyright.rst index c5af373c81..f5866e8bc2 100644 --- a/doc/copyright.rst +++ b/doc/copyright.rst @@ -6,7 +6,7 @@ Copyright .. code-block:: none Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com> - Copyright (C) 2001-2017 Marc Delisle <marc_at_infomarc.info> + Copyright (C) 2001-2018 Marc Delisle <marc_at_infomarc.info> Olivier Müller <om_at_omnis.ch> Robin Johnson <robbat2_at_users.sourceforge.net> Alexander M. Turek <me_at_derrabus.de> |