Martin Weinelt f10e8df3b9 python3Packages.{aiopvapi,twentemilieu,wled}: fix merge		2021-12-13 12:31:01 +01:00
..
applications	Merge branch 'master' into staging-next	2021-12-13 12:20:07 +01:00
build-support	Merge branch 'master' into staging-next	2021-12-13 12:20:07 +01:00
common-updater
data	Merge branch 'master' into staging-next	2021-12-13 12:20:07 +01:00
desktops	gnome.gnome-calendar: 41.1 -> 41.2	2021-12-12 21:30:38 +01:00
development	python3Packages.{aiopvapi,twentemilieu,wled}: fix merge	2021-12-13 12:31:01 +01:00
games	Merge pull request #149117 from trofi/update-fheroes2	2021-12-13 10:33:11 +08:00
misc	Merge branch 'master' into staging-next	2021-12-11 13:15:49 -05:00
os-specific	Merge branch 'master' into staging-next	2021-12-13 12:20:07 +01:00
pkgs-lib
servers	Merge branch 'master' into staging-next	2021-12-13 12:20:07 +01:00
shells	Merge pull request #149807 from r-ryantm/auto-update/oil	2021-12-09 10:08:02 +00:00
stdenv	Merge master into staging-next	2021-12-11 00:01:48 +00:00
test	Merge pull request #124556 from bergkvist/bergkvist/make-c-wrapper	2021-12-10 00:45:30 +01:00
tools	Merge branch 'master' into staging-next	2021-12-13 12:20:07 +01:00
top-level	Merge branch 'master' into staging-next	2021-12-13 12:20:07 +01:00