diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-08-29 10:51:54 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-08-29 10:51:54 +0200 |
commit | 2858c41823db1654f123c455cca2b145b8d8737b (patch) | |
tree | 48518e1eb8916d1528d75823c2d1232822d059e9 /pkgs/desktops/gnome-3 | |
parent | 34b6bbe021baa11a4dddf9532b331dac8d4162f2 (diff) | |
parent | e1f755e44faa5745ad3a8b18e18017e77dfbe67c (diff) | |
download | nixpkgs-2858c41823db1654f123c455cca2b145b8d8737b.tar nixpkgs-2858c41823db1654f123c455cca2b145b8d8737b.tar.gz nixpkgs-2858c41823db1654f123c455cca2b145b8d8737b.tar.bz2 nixpkgs-2858c41823db1654f123c455cca2b145b8d8737b.tar.lz nixpkgs-2858c41823db1654f123c455cca2b145b8d8737b.tar.xz nixpkgs-2858c41823db1654f123c455cca2b145b8d8737b.tar.zst nixpkgs-2858c41823db1654f123c455cca2b145b8d8737b.zip |
Merge branch 'master' into staging
There were some conflicts in python modules, commented at #28314.
Diffstat (limited to 'pkgs/desktops/gnome-3')
0 files changed, 0 insertions, 0 deletions