Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Conflicts: docs/source/bibtex/refs.bib docs/source/conf.py
- Loading branch information
Conflicts: docs/source/bibtex/refs.bib docs/source/conf.py