Matthew Justin Bauer f4de9e0d2c Merge pull request #38889 from DerTim1/asterisk-update ... asterisk: 14.6.1 -> 15.3.0, 13.17.1 -> 13.20.0		2018-04-21 20:56:04 -05:00
..
applications	Merge pull request #38801 from worldofpeace/wire-desktop	2018-04-21 20:47:56 -05:00
build-support	Merge pull request #39003 from P-E-Meunier/carnix-0.7	2018-04-19 12:09:55 -05:00
common-updater
data	Merge pull request #39204 from r-ryantm/auto-update/osinfo-db	2018-04-21 18:26:32 +01:00
desktops	Merge pull request #39201 from r-ryantm/auto-update/pluma	2018-04-21 19:03:48 +01:00
development	flintqs: init at 1.0	2018-04-21 20:43:56 -05:00
games	asc: fix build	2018-04-21 21:43:52 +01:00
misc	Merge pull request #39252 from r-ryantm/auto-update/cups-filters	2018-04-21 12:44:30 +01:00
os-specific	Merge pull request #39122 from sorki/zfs_exportfs	2018-04-21 19:32:05 +01:00
servers	Merge pull request #38889 from DerTim1/asterisk-update	2018-04-21 20:56:04 -05:00
shells	pkgs/shells: move extensions to subdirs	2018-04-17 14:47:32 -05:00
stdenv	Merge pull request #39172 from obsidiansystems/ios-cross	2018-04-19 17:00:05 -04:00
test
tools	lf: 2 -> 3	2018-04-21 23:59:17 +02:00
top-level	Merge pull request #38801 from worldofpeace/wire-desktop	2018-04-21 20:47:56 -05:00