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