Merge branch 'master' into tor

This commit is contained in:
Joey Hess 2016-11-29 23:45:25 -04:00
commit b039e5cc35
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
2 changed files with 13 additions and 1 deletions

View file

@ -16,7 +16,6 @@ import Assistant.DaemonStatus
import Assistant.Types.Buddies
import Utility.NotificationBroadcaster
import Utility.Yesod
import Utility.WebApp
import Utility.AuthToken
import Data.Text (Text)