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