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
..
_static	Document logo font. Recreate logo png. Remove GIMP logo file.	2016-03-31 21:37:30 +02:00
borg_theme/css	Merge branch '1.0-maint'	2016-08-26 20:47:23 +02:00
misc	Merge branch '1.0-maint' into master	2016-07-28 00:29:43 +02:00
usage	ran build_usage	2016-12-20 23:09:28 +01:00
api.rst	Merge branch '1.0-maint'	2016-10-24 21:41:20 +02:00
authors.rst	fix levels in authors section	2016-11-04 21:14:59 -04:00
book.rst	remove third level headings, too verbose	2016-11-04 21:15:31 -04:00
changes.rst	Merge branch '1.0-maint' into merge/1.0-maint	2017-01-12 15:01:41 +01:00
conf.py	It's 2017	2016-12-31 16:53:30 +02:00
deployment.rst	Merge branch '1.0-maint'	2016-10-24 21:41:20 +02:00
development.rst	Merge branch '1.0-maint'	2016-11-17 23:56:34 +01:00
faq.rst	Merge branch '1.0-maint' into merge/1.0-maint	2017-01-12 15:01:41 +01:00
global.rst.inc	crypto: link against system libb2, if possible	2016-11-11 03:08:11 +01:00
index.rst	fix PDF rendering structure	2016-11-04 16:01:18 -04:00
installation.rst	Merge branch '1.0-maint' into master	2016-12-17 13:26:28 +01:00
internals.rst	add more details about resource usage	2016-11-26 04:34:01 +01:00
introduction.rst	fix PDF rendering structure	2016-11-04 16:01:18 -04:00
Makefile
quickstart.rst	Merge branch 'partial-1.0-maint' into merge/1.0-maint	2016-12-20 23:05:44 +01:00
resources.rst	fix most non-python-source related sphinx warnings	2016-07-10 17:25:51 +02:00
support.rst	move security verification to support section	2016-11-04 20:58:27 -04:00
usage.rst	Merge branch '1.0-maint' into merge/1.0-maint	2017-01-12 15:01:41 +01:00