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