summaryrefslogtreecommitdiff
path: root/nix/sync-with-upstream
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-12-17 23:00:42 +0100
committerLudovic Courtès <ludo@gnu.org>2014-12-19 22:47:37 +0100
commit36457566f9917dc7c0c348d012816a2ca333ef1b (patch)
tree6f1d22a195ea2483b9ce539227d65e8e2a9c137d /nix/sync-with-upstream
parent2c7ee1672029aa43afb509af5b5f7261244fa2d1 (diff)
Merge branch 'nix' into 'master'.
Diffstat (limited to 'nix/sync-with-upstream')
0 files changed, 0 insertions, 0 deletions