summaryrefslogtreecommitdiffstats
BranchCommit messageAuthorAge
masterdrop unneeded conflicts to allow installation of php-phpseclib3Remi Collet4 years