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