Merge branch 'master' into tor

This commit is contained in:
Joey Hess 2016-11-29 15:45:29 -04:00
commit 398345cb26
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
35 changed files with 697 additions and 20 deletions

View file

@ -2,7 +2,7 @@
-
- Copyright 2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU AGPL version 3 or higher.
- Licensed under the GNU GPL version 3 or higher.
-}
module Assistant.Fsck where

View file

@ -2,7 +2,7 @@
-
- Copyright 2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU AGPL version 3 or higher.
- Licensed under the GNU GPL version 3 or higher.
-}
module Assistant.Gpg where

View file

@ -2,7 +2,7 @@
-
- Copyright 2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU AGPL version 3 or higher.
- Licensed under the GNU GPL version 3 or higher.
-}
{-# LANGUAGE CPP #-}

View file

@ -2,7 +2,7 @@
-
- Copyright 2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU AGPL version 3 or higher.
- Licensed under the GNU GPL version 3 or higher.
-}
{-# LANGUAGE CPP #-}

View file

@ -2,7 +2,7 @@
-
- Copyright 2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU AGPL version 3 or higher.
- Licensed under the GNU GPL version 3 or higher.
-}
{-# LANGUAGE CPP #-}