Marco Quezada 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 years ago
..
hackathon 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 years ago
hackathon_starter 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 years ago
Makefile 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 years ago
conf.py 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 years ago
index.rst 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 years ago
make.bat 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 years ago
manage.py 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 years ago