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 години