2 commits

Author	SHA1	Message	Date
jorge	42ae15c4c4	css after merge with fix/button-sizes	2021-07-28 13:10:35 +02:00
jorge	b21780c1cb	added a git merge rule to avoid default.css to be over written from other branches, instead it has to be created usin npm/gulp	2021-07-28 13:05:51 +02:00