summary refs log tree commit diff
path: root/nixos/modules/system/boot/loader/grub
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-09-08 11:42:09 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-09-08 11:42:09 +0200
commit585983bc954d043d40a14b29c0bddca42bb9cdfb (patch)
treef64c271969e6fa21b7e3e49da7653a92f2d6face /nixos/modules/system/boot/loader/grub
parentff85b53c5f266a6a7bbcf8b30c4eea7c3f6160ee (diff)
parenta71744392b6964e624d3ae968bee660731b7d271 (diff)
downloadnixlib-585983bc954d043d40a14b29c0bddca42bb9cdfb.tar
nixlib-585983bc954d043d40a14b29c0bddca42bb9cdfb.tar.gz
nixlib-585983bc954d043d40a14b29c0bddca42bb9cdfb.tar.bz2
nixlib-585983bc954d043d40a14b29c0bddca42bb9cdfb.tar.lz
nixlib-585983bc954d043d40a14b29c0bddca42bb9cdfb.tar.xz
nixlib-585983bc954d043d40a14b29c0bddca42bb9cdfb.tar.zst
nixlib-585983bc954d043d40a14b29c0bddca42bb9cdfb.zip
Merge remote-tracking branch 'origin/staging'
Conflicts:
	pkgs/applications/version-management/subversion/default.nix
Diffstat (limited to 'nixos/modules/system/boot/loader/grub')
0 files changed, 0 insertions, 0 deletions