Merge branch 'master' into linuxdst

2018-06-12 07:40:40 -07:00
parent 2a3af5214e 3800d67d71
commit 038f5dc554
147 changed files with 2008 additions and 312 deletions
--- a/docs/conf.py
+++ b/docs/conf.py
@ -59,7 +59,7 @@ master_doc = 'index'

 # General information about the project.
 project = u'lemur'
-copyright = u'2015, Netflix Inc.'
+copyright = u'2018, Netflix 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