Franz Pletz 35654b7fc1 Merge pull request #17743 from mayflower/service/mattermost		2016-08-16 14:54:25 +02:00
..
applications	mercurial: pass in pythonPackages	2016-08-16 11:48:09 +02:00
build-support
data
desktops
development	protobuf: 3.0.0-beta-3.1 -> 3.0.0	2016-08-16 12:09:36 +02:00
games
misc
os-specific	Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"	2016-08-15 19:05:52 -04:00
servers
shells
stdenv	Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"	2016-08-15 19:05:52 -04:00
test
tools	Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"	2016-08-15 19:05:52 -04:00
top-level	Merge pull request #17743 from mayflower/service/mattermost	2016-08-16 14:54:25 +02:00