Skip to content
Commit fae60693 authored by Fabian Schmitthenner's avatar Fabian Schmitthenner
Browse files

Merge branch 'master' of https://github.com/nixos/nixpkgs into digikam

parents 86cfcabf 023aaf8f
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment