summaryrefslogtreecommitdiffstats
path: root/test/integration/test-bug-747261-arch-specific-conflicts (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merging upstream version 2.9.4.Daniel Baumann2024-05-301-0/+1
* Adding upstream version 2.7.12.upstream/2.7.12Daniel Baumann2024-04-131-0/+46