Merge branch 'master' into incrementalfsck

This commit is contained in:
Joey Hess 2013-10-13 15:05:44 -04:00
commit a1040a38c5
18 changed files with 505 additions and 9 deletions

View file

@ -18,7 +18,6 @@ import qualified Remote
import Types.Remote (RemoteConfig)
import Types.StandardGroups
import Logs.Remote
import Assistant.Gpg
import Assistant.WebApp.Utility
import Git.Remote
@ -26,6 +25,7 @@ import qualified Data.Map as M
#endif
import qualified Data.Text as T
import Network.URI
import Assistant.Gpg
webDAVConfigurator :: Widget -> Handler Html
webDAVConfigurator = page "Add a WebDAV repository" (Just Configuration)