aboutsummaryrefslogtreecommitdiff
path: root/etc/gnu-store.mount.in
diff options
context:
space:
mode:
Diffstat (limited to 'etc/gnu-store.mount.in')
0 files changed, 0 insertions, 0 deletions
generated by cgit
/guix/commit/doc?id=6a2546f92d07df04e5d700924edd027ed1e2ef11'>6a2546f92d07df04e5d700924edd027ed1e2ef11 (diff)parentc762df54786fd6f005f3b5307323f1d2df3cbf0b (diff)downloadguix-533a893cc6b03f100566760d6e0c8e0500ed7082.tar.gz
guix-533a893cc6b03f100566760d6e0c8e0500ed7082.zip
Merge branch 'master' into staging
Conflicts: .guix-authorizations gnu/ci.scm gnu/packages/base.scm gnu/packages/databases.scm gnu/packages/gnome.scm gnu/packages/gtk.scm gnu/packages/imagemagick.scm gnu/packages/password-utils.scm gnu/packages/python-xyz.scm gnu/packages/web-browsers.scm
Diffstat (limited to 'doc')