Merge master into staging-next

Browse Source

...

This commit is contained in:

Frederik Rietdijk

2018-12-07 15:22:35 +01:00

parent 13ee78018c cb2a447c51

commit 5f554279ec

224 changed files with 5366 additions and 4075 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

pkgs/development/haskell-modules/hackage-packages.nix

Generated

+1249 -605

File diff suppressed because it is too large Load Diff