Merge branch 'fix/20210728' into fix/forms-seach-input-mods

This commit is contained in:
jorge 2021-07-28 14:21:41 +02:00
commit abb51ac63a
1 changed files with 1 additions and 0 deletions

1
.gitattributes vendored Normal file
View File

@ -0,0 +1 @@
default.css merge=ours