Marco Quezada 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 роки тому
..
partials 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 роки тому
scripts 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 роки тому
bower.json 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 роки тому