Files
nixpkgs/pkgs/tools/admin
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
..
2017-07-26 18:45:41 +02:00
2018-01-11 21:38:32 +08:00
2018-02-27 09:35:05 +01:00
2017-10-13 00:00:28 +02:00
2017-11-11 13:10:50 +01:00
2017-11-16 09:14:27 -08:00
2017-05-31 23:57:15 +01:00
2018-02-25 19:59:45 -08:00
2018-02-05 16:50:53 +08:00
2018-03-04 14:17:26 +01:00
2018-02-11 12:17:25 -08:00
2017-08-01 06:16:03 +02:00
2018-02-28 15:00:55 +00:00
2017-08-22 14:26:47 +01:00
2018-02-27 15:53:17 -08:00
2017-12-08 10:43:14 -08:00