Marco Quezada 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request %!s(int64=10) %!d(string=hai) anos
..
hackathon 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request %!s(int64=10) %!d(string=hai) anos
hackathon_starter 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request %!s(int64=10) %!d(string=hai) anos
Makefile 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request %!s(int64=10) %!d(string=hai) anos
conf.py 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request %!s(int64=10) %!d(string=hai) anos
index.rst 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request %!s(int64=10) %!d(string=hai) anos
make.bat 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request %!s(int64=10) %!d(string=hai) anos
manage.py 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request %!s(int64=10) %!d(string=hai) anos