Pascal Wittmann f7be21f4c9 Merge branch 'master' into add-missing-licenses ...

Conflicts:
	pkgs/development/libraries/exiv2/default.nix
        Set license to gpl2Plus

2018-08-06 12:04:52 +02:00

..

default.nix

Merge branch 'master' into add-missing-licenses

2018-08-06 12:04:52 +02:00