summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTW <tw@waldmann-edv.de>2019-02-20 06:10:11 +0100
committerGitHub <noreply@github.com>2019-02-20 06:10:11 +0100
commit091bd2bd79d6f3ac66ac6f3ed48ed96b2976570a (patch)
tree85e7fd79db89cc62ee099a8c59ef810f62903700
parentce69fc1e19855bdb6f646fae8a9037e448d7c984 (diff)
parent453e4a4b927658742042d9de64bf23927a0bd0f8 (diff)
Merge pull request #4377 from milkey-mouse/copyright-2019
Update copyright year
-rw-r--r--LICENSE2
-rw-r--r--docs/conf.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/LICENSE b/LICENSE
index 051e44c63..698326d49 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) 2015-2018 The Borg Collective (see AUTHORS file)
+Copyright (C) 2015-2019 The Borg Collective (see AUTHORS file)
Copyright (C) 2010-2014 Jonas Borgström <jonas@borgstrom.se>
All rights reserved.
diff --git a/docs/conf.py b/docs/conf.py
index 200e5423d..d80336e37 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -42,7 +42,7 @@ master_doc = 'index'
# General information about the project.
project = 'Borg - Deduplicating Archiver'
-copyright = u'2010-2014 Jonas Borgström, 2015-2018 The Borg Collective (see AUTHORS file)'
+copyright = u'2010-2014 Jonas Borgström, 2015-2019 The Borg Collective (see AUTHORS file)'
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the