John Ericson 1147d2ed89 Merge remote-tracking branch 'upstream/master' into xorg-override		2018-10-18 12:00:37 -04:00
..
applications	Merge pull request #48306 from NixOS/staging-next	2018-10-18 11:23:04 +02:00
build-support	Merge pull request #48306 from NixOS/staging-next	2018-10-18 11:23:04 +02:00
common-updater
data	Merge pull request #48382 from r-ryantm/auto-update/osinfo-db	2018-10-15 23:30:49 +01:00
desktops	deepin-movie-reborn: init at 3.2.10 (#48651)	2018-10-18 11:36:14 +02:00
development	Merge pull request #48650 from marsam/feature/update-ruby	2018-10-18 16:00:14 +02:00
games	Merge pull request #48306 from NixOS/staging-next	2018-10-18 11:23:04 +02:00
misc	seafile-shared: 6.2.4 -> 6.2.5	2018-10-17 17:49:33 +02:00
os-specific	linux: 4.18.14 -> 4.18.15	2018-10-18 08:27:12 -04:00
servers	Merge remote-tracking branch 'upstream/master' into xorg-override	2018-10-18 12:00:37 -04:00
shells	oh-my-zsh: 2018-09-03 -> 2018-09-14	2018-10-16 16:50:46 -04:00
stdenv	Merge pull request #37600 from abbradar/impureusenative	2018-10-13 14:09:55 +00:00
test	Merge branch 'master' into staging	2018-09-24 21:18:23 +02:00
tools	Merge pull request #48656 from dywedir/bat	2018-10-18 12:49:48 +01:00
top-level	Merge remote-tracking branch 'upstream/master' into xorg-override	2018-10-18 12:00:37 -04:00