summaryrefslogtreecommitdiffstats
path: root/user_guide_src/source
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2018-01-09 10:32:02 +0100
committerAndrey Andreev <narf@devilix.net>2018-01-09 10:38:30 +0100
commitcce6bd170f24cf0f10ca0b58150d0324433a66be (patch)
tree367772ab6ca66dc40abb3cb8e9ac7733ba18f401 /user_guide_src/source
parent97e50f72d5920c13d15a0178f5065b06d6e53903 (diff)
[ci skip] Merge pull request #5376 from jim-parry/copyright-update
Annual copyright update Conflicts resolved: system/libraries/Cache/drivers/Cache_apcu.php
Diffstat (limited to 'user_guide_src/source')
-rw-r--r--user_guide_src/source/conf.py4
-rw-r--r--user_guide_src/source/license.rst2
2 files changed, 3 insertions, 3 deletions
diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py
index e2b1c2972..a3d758ee8 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'2014 - 2017, British Columbia Institute of Technology'
+copyright = u'2014 - 2018, British Columbia Institute of Technology'
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
@@ -229,7 +229,7 @@ man_pages = [
epub_title = u'CodeIgniter'
epub_author = u'British Columbia Institute of Technology'
epub_publisher = u'British Columbia Institute of Technology'
-epub_copyright = u'2014 - 2017, British Columbia Institute of Technology'
+epub_copyright = u'2014 - 2018, British Columbia Institute of Technology'
# The language of the text. It defaults to the language option
# or en if the language is not set.
diff --git a/user_guide_src/source/license.rst b/user_guide_src/source/license.rst
index c943c294a..d65b56431 100644
--- a/user_guide_src/source/license.rst
+++ b/user_guide_src/source/license.rst
@@ -2,7 +2,7 @@
The MIT License (MIT)
#####################
-Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+Copyright (c) 2014 - 2018, British Columbia Institute of Technology
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal