mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' into remotecontrol

Browse source 
Conflicts:
	doc/devblog/day_152__more_ssh_connection_caching.mdwn
This commit is contained in:
Joey Hess 2014-04-14 13:38:35 -04:00
commit 138d25518d
20 changed files with 93 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Assistant/WebApp/Configurators/Local.hs
View file

@ -27,7 +27,6 @@ import Utility.DiskFree
import Utility.Mounts
#endif
import Utility.DataUnits
import Utility.Network
import Remote (prettyUUID)
import Annex.UUID
import Annex.Direct

1
Assistant/WebApp/Configurators/Pairing.hs
View file

@ -21,7 +21,6 @@ import Assistant.Ssh
import Assistant.Alert
import Assistant.DaemonStatus
import Utility.Verifiable
import Utility.Network
#endif
#ifdef WITH_XMPP
import Assistant.XMPP.Client