Pascal Wittmann af8cd3c74e Merge branch 'master' into add-missing-licenses ... Conflicts: pkgs/applications/version-management/subversion/default.nix		2018-08-09 13:10:27 +02:00
..
applications	Merge branch 'master' into add-missing-licenses	2018-08-09 13:10:27 +02:00
build-support
common-updater
data	Merge branch 'master' into add-missing-licenses	2018-08-09 13:10:27 +02:00
desktops	Merge pull request #44791 from r-ryantm/auto-update/deepin-gtk-theme	2018-08-09 07:29:21 +01:00
development	Merge branch 'master' into add-missing-licenses	2018-08-09 13:10:27 +02:00
games	Merge branch 'master' into add-missing-licenses	2018-08-09 13:10:27 +02:00
misc	Merge branch 'master' into add-missing-licenses	2018-08-09 13:10:27 +02:00
os-specific	Merge branch 'master' into add-missing-licenses	2018-08-09 13:10:27 +02:00
servers	Merge branch 'master' into add-missing-licenses	2018-08-09 13:10:27 +02:00
shells	antibody: 3.5.1 -> 3.6.1 (#44481)	2018-08-05 21:00:55 +02:00
stdenv
test
tools	Merge branch 'master' into add-missing-licenses	2018-08-09 13:10:27 +02:00
top-level	Merge pull request #44553 from yegortimoshenko/201808/toggldesktop	2018-08-09 09:32:53 +02:00