Merge branch 'master' into adjustedbranch

This commit is contained in:
Joey Hess 2016-03-11 12:21:26 -04:00
commit 97e97dccda
Failed to extract signature
69 changed files with 901 additions and 1080 deletions

View file

@ -522,6 +522,5 @@ syncFile ebloom rs af k = do
)
, return []
)
put dest = includeCommandAction $ do
showStart' "copy" k af
put dest = includeCommandAction $
Command.Move.toStart' dest False af k