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