css after merge with fix/button-sizes

This commit is contained in:
jorge 2021-07-28 13:10:35 +02:00
parent f4c2ec5074
commit 42ae15c4c4
2 changed files with 2 additions and 2 deletions

2
.gitattributes vendored
View File

@ -1 +1 @@
assets/css/default.css merge=ours default.css merge=ours

File diff suppressed because one or more lines are too long