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