diff options
| author | Ronald Beilsma <beilsma@gmail.com> | 2012-01-10 15:45:31 +0100 |
|---|---|---|
| committer | Ronald Beilsma <beilsma@gmail.com> | 2012-01-10 15:45:31 +0100 |
| commit | 25dcb93d05bd098e89188ea0691adf72228bd131 (patch) | |
| tree | 37d3d769f2e64bebb48a98378c7aee3ab4c17efe /user_guide_src/source/conf.py | |
| parent | db66eb38cfc4a2ab6c8816b8f7663211232d4f4e (diff) | |
| parent | e9a5a862a1252548b463aa738e50e8d9bfd01379 (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'user_guide_src/source/conf.py')
| -rw-r--r-- | user_guide_src/source/conf.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py index bb10d06e4..593ceaf1c 100644 --- a/user_guide_src/source/conf.py +++ b/user_guide_src/source/conf.py @@ -41,7 +41,7 @@ master_doc = 'index' # General information about the project. project = u'CodeIgniter' -copyright = u'2011, EllisLab, Inc.' +copyright = u'2012, EllisLab, Inc.' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -223,7 +223,7 @@ man_pages = [ epub_title = u'CodeIgniter' epub_author = u'EllisLab, Inc.' epub_publisher = u'EllisLab, Inc.' -epub_copyright = u'2011, EllisLab, Inc.' +epub_copyright = u'2012, EllisLab, Inc.' # The language of the text. It defaults to the language option # or en if the language is not set. |