Frederik Rietdijk e1d48c6a3a python3Packages.django-simple-captcha: 0.5.12 -> 0.5.13		2020-11-05 15:46:58 -08:00
..
applications	Merge pull request #102635 from r-ryantm/auto-update/ocenaudio	2020-11-05 10:42:00 -08:00
build-support	Merge pull request #101403 from mickours	2020-11-05 00:17:36 +01:00
common-updater	scripts/mark-broken: improve	2020-10-30 23:11:36 -07:00
data	Merge branch 'master' into staging-next	2020-11-05 09:42:47 +01:00
desktops	Merge branch 'master' into staging-next	2020-11-05 09:42:47 +01:00
development	python3Packages.django-simple-captcha: 0.5.12 -> 0.5.13	2020-11-05 15:46:58 -08:00
games	openxray: 730-july-preview -> 784-october-preview	2020-11-04 11:32:01 +01:00
misc	Merge staging-next into staging	2020-11-04 09:28:07 +01:00
os-specific	Merge branch 'master' into staging-next	2020-11-05 09:42:47 +01:00
pkgs-lib
servers	Merge branch 'master' into staging-next	2020-11-05 09:42:47 +01:00
shells	Merge staging-next into staging	2020-11-04 09:28:07 +01:00
stdenv	Merge branch 'master' into staging-next	2020-10-31 14:30:44 +01:00
test	Recover the complicated situation after my bad merge	2020-10-26 09:01:04 +01:00
tools	Merge branch 'master' into staging-next	2020-11-05 09:42:47 +01:00
top-level	Merge branch 'master' into staging-next	2020-11-05 09:42:47 +01:00