fix/20210728 #14

Merged
chris merged 48 commits from fix/20210728 into develop 2021-07-29 22:39:06 +02:00
2 changed files with 2 additions and 2 deletions
Showing only changes of commit 42ae15c4c4 - Show all commits

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