Marco Quezada 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 роки тому
..
css 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 роки тому
img 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 роки тому
js 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 роки тому
lib 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 роки тому
templates 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 роки тому
index.html 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 роки тому