Jan Malakhovski 0f4eb7f977 conky: move defaults to package file		2019-02-03 15:33:12 +00:00
..
applications	Merge branch 'staging-next'	2019-02-20 09:38:45 +01:00
build-support	Merge branch 'staging-next'	2019-02-20 09:38:45 +01:00
common-updater	common-update-scripts: fixup for current/latest nix hash output	2019-02-11 17:54:35 -06:00
data	Merge master into staging-next	2019-02-16 09:29:54 +01:00
desktops	pantheon.granite: fetch for DateTime GSettings patch	2019-02-18 18:52:42 -05:00
development	ocamlPackages.yojson: 1.4.1 -> 1.6.0	2019-02-20 10:41:53 +01:00
games	Merge branch 'master' into staging-next	2019-02-17 08:05:24 +01:00
misc	Merge branch 'staging-next'	2019-02-20 09:38:45 +01:00
os-specific	conky: move defaults to package file	2019-02-03 15:33:12 +00:00
servers	Merge branch 'staging-next'	2019-02-20 09:38:45 +01:00
shells	oil: 0.3.0 -> 0.6.pre15	2019-02-19 12:07:52 +01:00
stdenv	Merge remote-tracking branch 'origin/master' into staging	2019-02-09 12:14:06 -05:00
test	linux: added tests for the config	2019-01-28 09:07:24 +09:00
tools	grub2: patch to work with updated binutils	2019-02-20 11:22:54 +01:00
top-level	conky: move defaults to package file	2019-02-03 15:33:12 +00:00