summaryrefslogtreecommitdiffstats
path: root/kde5-net/konqueror/CONFLICTS
AgeCommit message (Expand)Author
2016-11-10kde5-net/konqueroTreeve Jelbert