summary refs log tree commit diff
path: root/pkgs/servers/shishi/default.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-09-08 13:53:33 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-09-08 13:53:33 +0200
commit152ae27aac2a78acee996eb035ef2b40e58bbf9d (patch)
tree5fbe2015755af2c907ce67ebe70e9fc7588eea9c /pkgs/servers/shishi/default.nix
parentaf69fcde47774876588fbf61179ca0e55fa69eac (diff)
parent3d821c068ad431d0115d559cd476ab6ffae11b85 (diff)
Merge remote-tracking branch 'origin/systemd-216' into staging
Diffstat (limited to 'pkgs/servers/shishi/default.nix')
0 files changed, 0 insertions, 0 deletions