Mario Rodas 8e09ba3b59 Merge pull request #87709 from zowoq/conmon ... conmon: 2.0.15 -> 2.0.16		2020-05-13 02:17:45 -05:00
..
applications	Merge pull request #87709 from zowoq/conmon	2020-05-13 02:17:45 -05:00
build-support	Merge pull request #87314 from matthewbauer/bazel-flat	2020-05-11 15:27:48 -05:00
common-updater	genericUpdater: add attribute argument to ignore some versions	2020-05-04 14:33:03 -03:00
data	Merge pull request #87448 from romildo/upd.shades-of-gray-theme	2020-05-10 20:41:36 -03:00
desktops	Merge pull request #87235 from NixOS/staging-next	2020-05-11 22:07:40 +02:00
development	Merge pull request #85687 from mayflower/privacyidea	2020-05-13 09:08:57 +02:00
games	Merge pull request #84209 from prusnak/freeciv	2020-05-10 23:11:07 +02:00
misc	Merge master into staging-next	2020-05-11 09:19:26 +02:00
os-specific	linux-hardened: Fix kernel version detection	2020-05-12 08:37:08 -04:00
servers	serviio: 2.0 -> 2.1	2020-05-12 22:17:36 -07:00
shells	Merge master into staging-next	2020-05-10 09:43:48 +02:00
stdenv	mkDerivation mesonFlags: Fix arm cpu families	2020-04-28 22:56:20 -04:00
test
tools	Merge pull request #87490 from r-ryantm/auto-update/syslog-ng	2020-05-13 01:15:41 -05:00
top-level	Merge pull request #85687 from mayflower/privacyidea	2020-05-13 09:08:57 +02:00