Marian Beermann ecad0ed53a Merge branch '1.0-maint' into merge/1.0-maint ... # Conflicts: ... everywhere ... # .travis.yml # Vagrantfile # borg/testsuite/key.py # docs/changes.rst # docs/quickstart.rst # docs/usage.rst # docs/usage/upgrade.rst.inc # src/borg/archive.py # src/borg/archiver.py # src/borg/crypto.pyx # src/borg/helpers.py # src/borg/key.py # src/borg/remote.py # src/borg/repository.py # src/borg/testsuite/archive.py # src/borg/testsuite/archiver.py # src/borg/testsuite/crypto.py # src/borg/testsuite/helpers.py # src/borg/testsuite/repository.py # src/borg/upgrader.py # tox.ini		2017-01-12 15:01:41 +01:00
..
attic.txt	move attic test dependency into own file	2016-06-21 20:06:36 +02:00
development.txt	Merge branch '1.0-maint' into merge/1.0-maint	2017-01-12 15:01:41 +01:00
fuse.txt	add comment about requiring llfuse, fixes #1726	2016-10-19 00:56:22 +02:00