Merge branch 'master' into gh-pages
Merge branch 'Catalina' into gh-pages

Conflicts:
	css/stampa.css
Merge branch 'master' into gh-pages

Conflicts:
	css/stampa.css
	index.html
	less/iconos-lista.less
	less/iconos-ruta.less
	less/iconos-variables.less
	src/selection.json
ajustes
Merge branch 'develop' into gh-pages
Merge branch 'develop'
Merge branch 'develop' into gh-pages

Conflicts:
	css/stampa.css
	index.html
deleted
Merge pull request #1 from eadpucv/develop

Develop
Merge branch 'develop'
Merge branch 'master' of https://github.com/eadpucv/stampa
Merge branch 'master' into gh-pages
Merge branch 'develop'
Merge branch 'master' into gh-pages

Conflicts:
	css/stampa.css
.woff
Merge remote-tracking branch 'origin/develop'
Merge branch 'master' into gh-pages
Merge branch 'develop'
Merge branch 'master' into gh-pages
nueva versión con más iconos