Evan Tschannen 684a22a52b Merge branch 'release-6.0' ... # Conflicts: # documentation/sphinx/source/release-notes.rst # fdbbackup/backup.actor.cpp # fdbclient/BackupContainer.actor.cpp # fdbclient/HTTP.actor.cpp # fdbserver/storageserver.actor.cpp # fdbserver/workloads/BackupCorrectness.actor.cpp # versions.target		2019-01-09 16:14:46 -08:00
..
extensions	Fixed carriage return line endings	2018-05-23 11:34:26 -07:00
source	Merge branch 'release-6.0'	2019-01-09 16:14:46 -08:00
.gitignore	Initial import of cleaned up documentation.	2018-03-13 13:09:35 -07:00
.pip.conf	Initial import of cleaned up documentation.	2018-03-13 13:09:35 -07:00
Makefile	Merge pull request #403 from richardalow/fix-docs-build	2018-06-11 16:54:23 -07:00
conf.py	switch module name of ruby domain to sphinxcontrib.rubydomain	2018-06-30 13:26:12 -07:00
requirements.txt	Add a documentation plugin for the formatting in our Ruby docs.	2018-06-27 14:58:34 -07:00