Frederik Rietdijk 1ede2de8a3 pythonPackages.editorconfig: -> 0.12.1 -> 0.12.2		2019-09-06 15:18:45 +02:00
..
applications	Merge branch 'master' into staging-next	2019-09-06 03:20:09 +02:00
build-support	Merge branch 'master' into staging-next	2019-09-06 03:20:09 +02:00
common-updater
data	Merge branch 'master' into staging-next	2019-09-06 03:20:09 +02:00
desktops	Merge branch 'master' into staging-next	2019-09-06 03:20:09 +02:00
development	pythonPackages.editorconfig: -> 0.12.1 -> 0.12.2	2019-09-06 15:18:45 +02:00
games	Merge staging-next into staging	2019-08-31 18:07:33 +02:00
misc	Merge branch 'master' into staging-next	2019-09-06 03:20:09 +02:00
os-specific	Merge branch 'staging-next' into staging	2019-09-06 03:21:30 +02:00
servers	Merge branch 'staging-next' into staging	2019-09-06 03:21:30 +02:00
shells	Merge branch 'master' into staging-next	2019-09-04 11:00:56 +02:00
stdenv	Merge branch 'master' into staging	2019-09-02 23:25:24 +02:00
test	treewide: remove redundant rec	2019-08-28 11:07:32 +00:00
tools	Merge branch 'master' into staging-next	2019-09-06 03:20:09 +02:00
top-level	pythonPackages.editorconfig: remove duplicate EditorConfig	2019-09-06 15:18:45 +02:00