Marco Quezada 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 jaren geleden
..
css 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 jaren geleden
img 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 jaren geleden
js 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 jaren geleden
lib 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 jaren geleden
templates 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 jaren geleden
index.html 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 jaren geleden