Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2014-04-19 17:30:38 -04:00
commit e8648a0a90
1 changed files with 13 additions and 0 deletions

View File

@ -11,6 +11,19 @@
[[!inline raw=yes pages="README"]] [[!inline raw=yes pages="README"]]
## enjoy
Hope you find Propellor fun and useful!
<pre>
-- _ ______`| ,-.__
{- Propellor -- / \___-=O`/|O`/__| (____.'
Deployed -} -- \ / | / ) _.-"-._
-- `/-==__ _/__|/__=-| ( \_
hosts :: [Host] -- * \ | | '--------'
hosts = -- (o) `
</pre>
## news ## news
[[!inline pages="news/* and !*/Discussion" show="4" archive=yes]] [[!inline pages="news/* and !*/Discussion" show="4" archive=yes]]