Marco Quezada 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request пре 10 година
..
hackathon 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request пре 10 година
hackathon_starter 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request пре 10 година
Makefile 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request пре 10 година
conf.py 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request пре 10 година
index.rst 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request пре 10 година
make.bat 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request пре 10 година
manage.py 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request пре 10 година