Merge pull request #442 from jakirkham/license_2017

Add 2017 to the license copyright
nanshe-org · Mar 10, 2017 · 8dab42d · 8dab42d
2 parents bd4b5df + 4639727
commit 8dab42d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2016, John Kirkham, Howard Hughes Medical Institute
+Copyright (c) 2016-2017, John Kirkham, Howard Hughes Medical Institute
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

diff --git a/docs/conf.py b/docs/conf.py
@@ -56,7 +56,7 @@
 
 # General information about the project.
 project = u'nanshe'
-copyright = u'2014-2015, John A. Kirkham'
+copyright = u'2014-2017, John A. Kirkham'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -278,7 +278,7 @@
 epub_title = u'Nanshe Documentation'
 epub_author = u'John A. Kirkham'
 epub_publisher = u'John A. Kirkham'
-epub_copyright = u'2014-2015, John A. Kirkham'
+epub_copyright = copyright
 
 # The basename for the epub file. It defaults to the project name.
 #epub_basename = u'..'