David Leonard b2109e8e40 Updating AngularJS Front-end 10 rokov pred
..
hackathon b2109e8e40 Updating AngularJS Front-end 10 rokov pred
hackathon_starter 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 rokov pred
Makefile 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 rokov pred
conf.py 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 rokov pred
index.rst 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 rokov pred
make.bat 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 rokov pred
manage.py 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 rokov pred