arcHIVE-tech/Arc-hive-omeka-theme
arcHIVE-tech
/
Arc-hive-omeka-theme
4
0
Fork 0
Code Issues 9 Pull Requests Projects Releases Wiki Activity

update main branch #47

Merged
jorge merged 166 commits from develop into main 2021-12-01 11:20:13 +01:00
Conversation 3 Commits 166 Files Changed 81 +2 -2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
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

2
asset/css/default.css
View File

File diff suppressed because one or more lines are too long