Marco Quezada 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 anni fa
..
partials 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 anni fa
scripts 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 anni fa
bower.json 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 anni fa
index.html 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 anni fa