Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2014-04-19 17:33:11 -04:00
commit 48a3ce4a9a
1 changed files with 2 additions and 0 deletions

View File

@ -24,6 +24,8 @@ hosts :: [Host] -- * \ | | '--------'
hosts = -- (o) `
</pre>
Propellor is free software, licensed under the terms of the GNU GPL 3.
## news
[[!inline pages="news/* and !*/Discussion" show="4" archive=yes]]