mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-03-20 19:05:46 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3505 from Abogical/new-year-1.1-maint

Browse source 
Celebrate the new year with 1.1-maint
This commit is contained in:
TW 2018-01-03 02:49:09 +01:00 • committed by GitHub
commit 3549736ec4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
LICENSE
View file

@ -1,4 +1,4 @@
Copyright (C) 2015-2017 The Borg Collective (see AUTHORS file)
Copyright (C) 2015-2018 The Borg Collective (see AUTHORS file)
Copyright (C) 2010-2014 Jonas Borgström <jonas@borgstrom.se>
All rights reserved.

2
docs/conf.py
View file

@ -42,7 +42,7 @@ master_doc = 'index'
# General information about the project.
project = 'Borg - Deduplicating Archiver'
copyright = '2010-2014 Jonas Borgström, 2015-2017 The Borg Collective (see AUTHORS file)'
copyright = '2010-2014 Jonas Borgström, 2015-2018 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

2
src/borg/shellpattern.py
View file

@ -15,7 +15,7 @@ def translate(pat, match_end=r"\Z"):
This function is derived from the "fnmatch" module distributed with the Python standard library.
Copyright (C) 2001-2017 Python Software Foundation. All rights reserved.
Copyright (C) 2001-2016 Python Software Foundation. All rights reserved.
TODO: support {alt1,alt2} shell-style alternatives