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 лет назад