Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2014-11-21 21:00:23 -04:00
commit 158b0aedc4
2 changed files with 4 additions and 4 deletions

View File

@ -2,3 +2,7 @@
[[!inline pages="news/* and !*/Discussion" show=0 archive=yes [[!inline pages="news/* and !*/Discussion" show=0 archive=yes
title="propellor news"]] title="propellor news"]]
## enjoy
Hope you find Propellor fun and useful!

View File

@ -19,10 +19,6 @@
</tr> </tr>
</table> </table>
## enjoy
Hope you find Propellor fun and useful!
<pre> <pre>
-- _ ______`| ,-.__ -- _ ______`| ,-.__
{- Propellor -- / \___-=O`/|O`/__| (____.' {- Propellor -- / \___-=O`/|O`/__| (____.'