summaryrefslogtreecommitdiffstats
path: root/test/integration/test-bug-747261-arch-specific-conflicts (follow)
Commit message (Expand)AuthorAgeFilesLines
* Adding upstream version 2.2.4.upstream/2.2.4upstreamDaniel Baumann2024-04-271-0/+46