Merge remote-tracking branch 'origin/master'

This commit is contained in:
Joey Hess 2014-05-29 14:29:37 -04:00
commit 02a808896f
1 changed files with 1 additions and 1 deletions

View File

@ -23,7 +23,7 @@ import qualified Propellor.Property.User as User
import qualified Propellor.Property.Cron as Cron import qualified Propellor.Property.Cron as Cron
"""]] """]]
This loads up Propellor's modules. You'll almost certianly want these; This loads up Propellor's modules. You'll almost certainly want these;
many more can be found in the [API documentation](http://hackage.haskell.org/package/propellor). many more can be found in the [API documentation](http://hackage.haskell.org/package/propellor).
[[!format haskell """ [[!format haskell """