summaryrefslogtreecommitdiff
path: root/actions/featured.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-12-22 08:53:20 -0800
committerEvan Prodromou <evan@status.net>2009-12-22 08:53:20 -0800
commitf17016470170401e1ad1b869c740063a578cb4cd (patch)
treea96c2dca4bc0b647b82e0dbca15e3a9ecbd632a7 /actions/featured.php
parent51838a969b51c43e04c5ed16a6ada7eb0e589fd8 (diff)
remove some merge cruft from README
Diffstat (limited to 'actions/featured.php')
0 files changed, 0 insertions, 0 deletions