summaryrefslogtreecommitdiff
path: root/Command/Sync.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-04-12 14:20:41 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-04-12 14:20:41 -0400
commitd4e54c2eba70ca4587c9ef0f9599a53225506e6f (patch)
treebca029eba2071672ee98f6a59fa0f1d20084786f /Command/Sync.hs
parentdb4897aaff83f33e049cbe731ae16da96f340297 (diff)
parentb356a4f8d13ca9e1e2d68b17dd0b7b93143c8ef5 (diff)
Merge branch 'master' into remotecontrol
Conflicts: debian/changelog
Diffstat (limited to 'Command/Sync.hs')
0 files changed, 0 insertions, 0 deletions