Files
nixpkgs/pkgs/tools/compression
Jan Malakhovski 7079e744d4 Merge branch 'master' into staging
Resolved the following conflicts (by carefully applying patches from the both
branches since the fork point):

   pkgs/development/libraries/epoxy/default.nix
   pkgs/development/libraries/gtk+/3.x.nix
   pkgs/development/python-modules/asgiref/default.nix
   pkgs/development/python-modules/daphne/default.nix
   pkgs/os-specific/linux/systemd/default.nix
2018-03-10 20:38:13 +00:00
..
2018-02-24 14:16:49 -08:00
2018-03-05 17:41:11 -06:00
2017-09-08 22:22:04 +02:00
2018-01-09 11:23:56 -05:00
2018-01-27 20:08:35 +01:00
2016-08-02 21:42:43 +03:00
2017-04-23 18:08:36 -05:00
2017-01-02 20:18:50 +01:00
2017-02-27 22:42:40 +01:00
2017-03-25 10:09:42 -05:00
2017-03-11 10:00:06 +01:00
2018-03-01 06:06:08 +02:00
2017-08-20 09:19:30 +02:00
2016-04-12 15:51:32 +02:00
2017-08-06 23:38:15 +02:00
2017-11-09 12:48:21 +01:00
2017-07-26 23:24:49 +02:00
2017-08-28 00:54:42 +02:00
2017-11-02 13:53:36 +00:00
2017-02-26 10:02:10 +01:00