summaryrefslogtreecommitdiffstats
path: root/test/integration/test-bug-960705-propagate-protected-to-satisfied-conflict (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merging upstream version 2.9.4.Daniel Baumann2024-05-301-1/+2
| | | | Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
* Adding upstream version 2.7.12.upstream/2.7.12Daniel Baumann2024-04-131-0/+53
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>