John Ericson 4ccb74011f Merge commit '18aa59b0f26fc707e7313f8467e67159e61600c2' from master into staging ... There was one conflict in the NixOS manual; I checked that it still built after resolving it.		2019-04-01 00:40:03 -04:00
..
applications	Merge commit '18aa59b0f26fc707e7313f8467e67159e61600c2' from master into staging	2019-04-01 00:40:03 -04:00
build-support	Merge commit '18aa59b0f26fc707e7313f8467e67159e61600c2' from master into staging	2019-04-01 00:40:03 -04:00
common-updater
data	Merge pull request #57905 from LinArcX/vazir-fonts	2019-03-25 22:22:18 -04:00
desktops	Merge commit '18aa59b0f26fc707e7313f8467e67159e61600c2' from master into staging	2019-04-01 00:40:03 -04:00
development	Merge commit '18aa59b0f26fc707e7313f8467e67159e61600c2' from master into staging	2019-04-01 00:40:03 -04:00
games	stuntrally: 2.6 -> 2.6.1	2019-03-23 14:11:53 +01:00
misc	Merge pull request #56773 from bricewge/solarc	2019-03-26 00:45:20 +00:00
os-specific	Merge commit '18aa59b0f26fc707e7313f8467e67159e61600c2' from master into staging	2019-04-01 00:40:03 -04:00
servers	Merge commit '18aa59b0f26fc707e7313f8467e67159e61600c2' from master into staging	2019-04-01 00:40:03 -04:00
shells	Merge pull request #57964 from andir/rssh	2019-03-22 13:19:06 +01:00
stdenv	top-level: Create pkgs{Build,Host,Target}{Build,Host,Target}	2019-03-24 22:12:15 -04:00
test
tools	Merge commit '18aa59b0f26fc707e7313f8467e67159e61600c2' from master into staging	2019-04-01 00:40:03 -04:00
top-level	Merge commit '18aa59b0f26fc707e7313f8467e67159e61600c2' from master into staging	2019-04-01 00:40:03 -04:00