Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2014-11-20 19:42:21 -04:00
commit e0d6014828
1 changed files with 1 additions and 1 deletions

View File

@ -35,5 +35,5 @@ title="propellor news"]]
## feeds ## feeds
[[!inline pages="feeds/*/* and !*/Discussion" show="4" archive=yes [[!inline pages="page(feeds/*/*) and !*/Discussion" show="4" archive=yes
title="propellor blog posts"]] title="propellor blog posts"]]